Added some investigation in to the IoC container
Removed build-fix hacks so I have to actually fix the issues later