Start tying to bring Solr docs up to date. Not finished yet.