Trade: mine/theirs
Trade: mine/theirs were mixed up
Validations
Trade
Trade working but perhaps needs refactoring