Some more Progress for Class