#112 & #113 - These are working like we want now

Also added in Discounts into the Chat window