redo
Revert "redo"

This reverts commit 3bf6dc583d7d877d7829b98911a39d616b6a8955.
Merge branch 'rewrite-with-discounts' of https://github.com/Scrapper89/BasisCode into rewrite-with-discounts