Further work on MVC