Finished up grammar, sans conflict resolution.

Shift-reduce conflict resolution is up next!