First pass at making CC work in random order