Added first grading functionality