User-story 4 finished