Added a class id instance var to classes.  Still need to initialize it and fix tests.
Initialized the id field, in theory and now have tested these changes, noticing no breakage.