TODO MVC - while I'm at it
Merge pull request #453 from kevmoo/master

TODO MVC: while I'm at it...