finish shuffling of clc classes. add spec skeletons