Updated experimental search code

It just needs debugging now!