KRACOEUS-7065 moving some negotiations code into negotiations