More work on refactored multi-server