Getting closer to a real client, somewhat