added Trade class, merged IDs in order, removed date in order, auto-generates TradeID and tradeTimes