StrangeIOC cleanup

Cleaned up a lot of code related to StrangeIOC to make more sense in an
MVC world.