refactored a few things on the search feature; search specs not finished;