Refactor out connection from NetworkHandler. AH-68