Almost done, just need to add 2 rules to grammer and write to file.