extend grammar + start work on to-FNIR