Progress. And search working (sort of) again...