big refactor (sorry everyone)
Merge pull request #21 from mikeemoo/master

Ummm!!!