Revert "Verb refactor"
Merge pull request #3 from JimTheCactus/revert-2-verb_refactor

Revert "Verb refactor"