Finished user stories 1,2 and 3