Started adding methods to handle execute methods, refactored some names
Fixed merge confilicts
Merge pull request #31 from jknewson/master

Started adding methods to handle execute methods, refactored some names