Speedups galore and grades
Complete grade implementation