Part way through Controller Redesign