Making progress. Sorta
Merge pull request #1 from ddsnowboard/master

Making progress. Sorta