Add lots of info and rework searching.