added more classes and updated grader.js