Adding search tool methods

(work in progress)