Working on search function

in progress