Updated Grammar

Needs corrections, testing...and so on..