Added subscribe to new server - not err free
Connecting between servers handled by client success
Fixed merge conflicts