Added class to handle a match
Added class to handle a match