Some work on NetworkHandler.