adding the rest of the classes