Are we sticking to the core 7 classes?