Refractoring + Tax/Discount tracking