Revert "Unfinished Search PartII"

This reverts commit 41be06643f79a138aca7fa36eb5ba4f267e003ec.
Revert "Unfinished Search"

This reverts commit 52262f9a44f6c6337c5fe5a14b910dd255bb31f4.