Nonterminal stubs
Merging commits from Jon and Stephen, started stubs for my set.