More zookeeper/SOLR work