Adding Search Capabilities - unfinished