Fixed!
Working on validation