Search (again)

New PR in lieu of #13