Basic Controller Framework Implemented
Merge branch 'controller' into dev