Adding client side stuff