Replace negotiator

Closes #1845 
Closes #2004