got search working
some more search stuff
resolving conflicts