Started working on validation