WIP add initial validations implementation