Built out  trades, added Avatar support