Added method for search, not finished