Final Edits/all validation and NaN complete