User Story 13 with delete