Search & local storage.

Signed-off-by: Mark Farrell <markfarr2011@gmail.com>