Added search, just a start.