Trying to make all injectable. Compiles, not tested yet.