Some work on the client window