Substantial progress. Restructured regex-capture pipeline. Bugs still exist (test 2). Need to develop more tests.