initial tweaks to controller
add Pauls control work and refactor
ready for another little release
Merge branch 'feature/controller' into staging