cleaned up some of the API calls - about to format the views and test the controllers