Did some more work to get CCI working