Added IOC in a few places. Removed a few TODOs.