More StrangeIOC

Continued the refactor for StrangeIOC. Ran into some snags but I think I
have the patterns that I'm needing figured out. :D