Still trying to add new classes