finished new grammar system!