WIP searching
Fixing merge conflicts