added the client side stuff.