Add more multi-server infrastructure.  Still not quite ready, but closer.