started implementing the search
fixed merf conflicts
implemented search results