Rewrite match indexing to allow for removal from memory of matches
Debug new match id system