Not done yet, but much cleaner
working in the late AM just doesn't work for me anymore
Merge pull request #10 from genghisjahn/refactor_1

Not done yet, but much cleaner