WIP: progress on user story 6