WIP: more matcher progress