More work on the client side.