Still don't merge - Solr

Still working on tests and small updates. Feedback would be great.