Added Searching
Fixed merge conflicts