made more changes. Trying to fix the guice injection issues