Grammar prototype
Updated grammar