most of controller, some progress on views