Merge pull request #3 from twuster/erica

WAT
wat
Merge pull request #4 from twuster/part_4

wat
wat