Some work done in onion_client.