refactor of the tradecontroller, lookin sexy