second commit
Lots of stuff, mostly search capability