Add in some rubric handling logic