StrangeIOC continued

Continued refactoring to support StrangeIOC