switched total cost and total retail, Changed discount to 2-tier, do not autopopulate margin for electronics funtions