Added Discounting and Discounting Tests
Cleaned it up a bit.