rebasing so that buy/sell can be added