Adding Search now works

I still need to do some testing before all changes are final and there
are most likely some bugs, but my preliminary testing indicates that
basic searching at least works though please be aware that I've done
very little testing so far.