Starting refactoring to MVC pt2