Added searching (not quite working yet)