WIP: working on class injection