Cleaned up original grader into grader2