User story 6 complete