Work on hint matching in progress