Switching to MVC Model