Adding more structure issue #26; added nouns closes #29.