Trades

All tests passing