Quick refactor to move much of the logic out of #call
Merge pull request #3 from mfpiccolo/refactor-one

Quick refactor to move much of the logic out of #call