Grading version

Version for passing the semester, needs further improvements for faster
working.