Editing finished. About to add validation