Merge "Fork Search code to independantly develop and test search."