added all classes... kind of