Refactor handoff to Server