First pass of idea
Merge pull request #16 from dipsticker/master

First pass of idea