Implemented story 5 in sprint 2