Working on delete breakage