Main controller now done, ready for testing