Rework Klass and start adding test code for discounts and date calcs