Update to grader.js - not complete, however