progress...
Merge pull request #1 from nathanabrewer/dev

progress...