list searching
merge
cant remember all the changes