Temp commit - do *not* revert to this

Pre-integration commit. The new code here is for grading stabs.
Not  needed, however, for initial testing