Stripped out the work on multiple server support, as it did not seem to be finished