Re-re-factor server handling