finally really added all classes