Lex's changes to the Trade stuff
Merge pull request #22 from InspiredIdealist/master

Lex's changes to the Trade stuff