Roll up
Updated grammar
Updated grammar. Misc refactoring.
Updated scratch grammar