Major overhaul of services and controllers