Some more client side work