Added searching, very nearly working