refactored graders, still needs to be tested with site