Initial plug-in of new parser

Need many, many more tests