Re-implement listing and deleting.