Made some small changes, and added version one of a grading mechanism