TODO MVC - while I'm at it