moving towards full ci-merchant, phase 2 of 3