Started working on validations
Merge