User stories 4 and 5