Completed half of user story 3