Implemented more code on the client side
Most of the client side code has now been implemented