Starting Controller Refactoring