Updated grammar. Working on Typechecker