another refactor -- needed to change optional arguments and this required top-down refactor
Merge pull request #20 from kevinquinnyo/another-refactor

another refactor -- needed to change optional arguments and this require...