Got grading working, bugs and output formatting left