Further on the way to a working client.