Nearly done converting classes to the new controllers...