work on major changes to matching (and some to apps)