First commit from aaron
Merge pull request #1 from JBrianGordon/aaronbranch

First commit from aaron