Undo delete implemented, added more validation

Break it.