Preparation for IOC

Initial commint