Moving to a MVC model