User Stories 13-16 added.