- Searching now partially work (need testing?)