Finish Search & Rearrange Code