Completed integration of the new grade_system class :)