TODO remove ALL the fluids, fix trading