Refactor match replays AGAIN. Maybe this new one will be more reliable