I think I'd rather do that in a separate round of refactoring