Trashed old model and controller code, finished initial version of new controller.