User Stories 1-4 added.