Getting basic controller functionality
Merge branch 'controllers'