Major Advancement in search, almost complete