Start refactoring controller to use command object.