Fixed classes and IDs #8

All classes, no IDs.