adapting Match to new typed graphs (in progress)