Saprky's portion done, but not sure about format
Fixed formats and completed shopping
discount finished