User Story 12 and 14