Revert "Revert "Grammer""

This reverts commit 0c573e312c00277978918be8a1d86e1c1b344608.