Refactoring MVC (WIP)