added the rest of the classes