Starting to integrate search