working search
fixed merge conflicts
stuff