Fixed the IOC container to inject on resolve, instead of register. Made minor tweaks to the class module.