Began the change to MVC