Add/input validation

Self explanatory PR is self explanatory