StrangeIoC

Starting to convert over to StrangeIoC! :D