Make things much more MVC