Some more work on g_client.c