Major progress on the client side