Update 12/19

Calculations working.
*only discount issue.