REsolved a few dependencies
Horrible hacks with reflection to get it compiling