D.Karlsson's parser w/unit tests