Continued working on client side validation