Started working on validation / feedback