Moving this block up in the flow now that we don't need to wait until locator finishes the walking process