moving grading into model package