Expand usage of dependency injection

While implementing the container, the easier services were added which yielded some design improvements.

We should now look at expanding into more difficult areas requiring more complicated refactors.