Expose matches once we know what we support
Re-did the matches stuff