DO NOT MERGE: Adam/more granular grading transactions