Adding more user table functionality, better TradeService test and logic