Did some renaming for consistency. Started to get some stuff setup for tradeDetails