basically functional
Merge pull request #11 from allknowingfrog/master

basically functional