Broken interface-driven version
It's 2:21am, but it was  worth it because this works
Dependency injection, terribly.
Merge branch 'master' of github.com:voltagex/junkcode