Adding a little bit to the grammar file, there is still plenty left to add to it, and I have to go over and make sure that I haven't duplicated any of the tokens.. It's starting to be a long file