New solr indexer

Please integrate