Work on managing matches