added nouns, a lot of weird string literals to figure out...