More work on the crystal class and subtypes!