Merge pull request #55 from cptmashek/master

More breaking the code out