Finally got the discount values to work correctly.  Now to clean up code and comment where needed.