Fix provider/factory stuff, but still need to find injection somewhere.
delayed loader working