Initial check-in with WIP grammar