Adding some client side goodness