Finish up with full server handling