Coverting Trades to use getters/setters