WIP: work on solr