User stories 4, 5, 6 done.