only thing left to do is move the svc handlers closer to the callsites