Add client side validations which aren't working yet