Fleshed out the controller classes somewhat.