More work on the client