Grades added

Still need to fix some stuff