Feature/grammarv2bis

Implementing grammarv2