Add more checks
Add url handling to grader