Started work on the CC addon