Integrated the new grade_system class (not yet functional)