Search imlementation
Major Changes