preparing to add client validation

preparing to add client validation