Matthew's user stories added