Use CCI - closes #8