User Stories 4,5,6