Use proper dependency injection

[withinboredom]

For sake of speed, I didn't do this properly. This needs to be refactored and done properly. A good example I found here: https://github.com/PioneerCode/pioneer-console-boilerplate