finished lw part 2
Merge pull request #27 from alexjcole/master

Part 2 Pull Request