Added all grammar to TODO