In progress CCR/CCA
Refactor in progress....