Controller->load singleton, tidy up...