Cleaned up the models, worked on service_provider controller and views