Need to do more, but updated TradeDevice.js