Starting MVC Refactor