partial changes, classgrades update
Revert "partial changes, classgrades update"

This reverts commit 88e5effb08e4c233ad8af059ded08e7fed700ede.
Revert "Revert "partial changes, classgrades update""

This reverts commit 0cee3517157a7891ee5f379eceb5b33c7d46ca8f.