start adding validations and tests