WIP - modifying checks and grader to support full complement of checks