Completes server refactor