Start working on controller support
Merge branch 'master' into controller
Implement very basic controller support