Implement a search layer Aug 8