CC WIP stuffs

by Luke Harrison