Working on validation and upload