Major changes to server handling.