adding _2 and finished implementing the client side