Re-did some of the serverManager stuff that got lost because of Joey's
merge conflicts