Move bonus_points etc to grading rule