more work on new parser, getting it into unstable