User Stories 4 and 5 implemented.