Initial implementation of user story 8