make matching work - work in progress