Work on new client side logic