Re-thinking the whole search component.