User stories 5 and 6