[#8] Complete rewrite of the grammar to be much much better