Got the first iteration of extendMatch mostly working