Work on negotiation, done correctly for now