First pass at redesigning solr handler