some progress on types and renaming to TradingInstrument