More work to get the client side working again.