Search accept rebase

Rebased on master... not all new tests pass.