Putting in DI and dependencies