User Story 9 complete for demo