KRACOEUS-7065 moving some negotiations code into negotiations
Merge pull request #50 from leoherbie/move_neg

 KRACOEUS-7065 moving some negotiations code into negotiations