Almost done fixing the creation of riderNegotiations and advanceNegotiations