basic controller support
Merge branch 'dev' into ryan-feature