Some more MVC magic