Guice stuff, needs work really