Shaping into an MVC