more refactoring, controllers are still not building