got matching working 90 percent of the way