updated controllers and services
initial load seems to work