Added formatting, first attempt at undelete