Create Partial Match Loop

This commit puts in place a do ... while loop that forces a partial
match to be created before moving on to the next step.