Continued work on the ClientWindow