Validations

In progress