Started work on the generic delete feature