you didnt waste any time!This looks good.
I think your and Christina's suggestions just make it work. something accessable for teachers and that will encourage them to use it. The clustering model was just getting to far away from practical use.
Stan likes it as well.