Dagger 2.0 - WIP. Needs work on base classes