Added verbs/adverbs/adjectives to CAH. Fixes #1