Primitive augmented grammar work

Reworking a grammar class for parsing.