KRACOEUS-7065 moving some coi code into coi
Merge pull request #48 from leoherbie/move_coi

 KRACOEUS-7065 moving some coi code into coi