Moved away from Dagger, it was probably unnecessary for this project, and it was frustrating me. Could probably go with Guice for the plain Java services if I really wanted DI