huge refactor - tradeState support for triplet