Moving the match functions (func/type) out to own object of type Match