Now working on the new parser, still buggy and terrible at the moment

This should be a lot better/more robust than the previous regex
method though, which was also terrible. Just a lot of cleaning up
and improving to do to get all tags supported and the current
testing ones behaving properly.