User Story 3 finished