More work on the client and Async code