Added list model, tried to clean up controller.