New MVC stuff

New MVC stuff