Started on Discounts problem. Tweaked some of the math.
Discount problem working but not perfect.