Initial working new grammar