almost made matching work

almost