User Stories 17-20