MVC work (in progress)
Merge