User Story 4 and code cleanup. Code coverage of 100%.