Lots of sloppy changes to resurrect the server