moved actions across to main controller
moved main tests across
Merge pull request #606 from theodi/main-controller

Main controller