Started refractoring
WORKING: Refractored url to solr