Move finding code into section 1