Updated experimental search parser

It just needs debugging now!