Generalized code to arbitrary numbers of units
Added method to print out class assortments
Classes have numbers now
Fixed unit tests