Not-well tested implentation of new searching