extend grammar 
make tests pass