Todo Controller and List Controller. Woot.
Merge branch 'controllers'