Making more progress on the client side.