Add more search functionality

Working on issue #7