Work toward allowing for restarting of matches