! Phase 1 of MVC refactoring