Aaron Anderson's solution for User Stories 1 and 2