ICAP Intermediate commit

Few things TBD