Added some MVC