In the middle of refactoring, numbers are up next