Move injectables into functions

So stuff isn't executed at import time. I just like lazy evaluation of things so execution doesn't happen until it is really needed.