Initial matching implementation