Looks good. TODO (self): Run tests, validate docs, merge on success.