Add search (Work In Progress)