WIP unification, wiring up DI-style