WIP controllers
More controller layer
Merge pull request #1128 from danott/requires

Requires