Working towards initial match detection