User stories 1 and 2 done