Yeah. I'm going to work with @cpirich to make sure I didn't screw anything up.

It was worth the test cost in this case since I already had to unify the dialogs (server/client).