Begin home view controller refactor
Finish refactoring