the beginnings of some refactoring.  So far just Category, Grade, and some things that were effected by the changes in these models