Controller WIP
Merge
Initial controller.