diff --git a/lib/task/search/arSolrSearchTask.class.php b/lib/task/search/arSolrSearchTask.class.php
new file mode 100644
index 0000000000..09b01ce2e1
--- /dev/null
+++ b/lib/task/search/arSolrSearchTask.class.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Access to Memory (AtoM) software.
+ *
+ * Access to Memory (AtoM) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Access to Memory (AtoM) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Populate search index.
+ */
+class arSolrSearchTask extends sfBaseTask
+{
+    public function execute($arguments = [], $options = [])
+    {
+        sfContext::createInstance($this->configuration);
+        sfConfig::add(QubitSetting::getSettingsArray());
+
+        new sfDatabaseManager($this->configuration);
+
+        $solr = new arSolrPlugin($options);
+
+        $client = $solr->getClient();
+        if (!$arguments['query']) {
+          $this->log('Please specify a search query.');
+        } else {
+          $this->runSolrQuery($client, $arguments['query']);
+        }
+    }
+
+    protected function configure()
+    {
+        $this->addArguments([
+            new sfCommandArgument('query', sfCommandArgument::OPTIONAL, 'Search query.'),
+        ]);
+
+        $this->addOptions([
+            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', 'qubit'),
+            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'cli'),
+        ]);
+
+        $this->namespace = 'solr';
+        $this->name = 'search';
+
+        $this->briefDescription = 'Search the search index for a result';
+        $this->detailedDescription = <<<'EOF'
+The [solr:search] task runs a search query on solr. Usage:
+  php symfony solr:search <query>
+EOF;
+    }
+
+    private function runSolrQuery($client, $queryText) {
+      $query = new SolrQuery();
+      $query->setQuery($queryText);
+
+      $query->setStart(0);
+      $query->setRows(1000);
+
+      $searchResponse = $client->query($query);
+
+      $response = $searchResponse->getResponse()->response;
+      if ($response->docs) {
+          foreach ($response->docs as $resp) {
+            $this->log(print_r($resp, true));
+          }
+      } else {
+        $this->log("No results found");
+      }
+    }
+}
diff --git a/plugins/arSolrPlugin/lib/arSolrPlugin.class.php b/plugins/arSolrPlugin/lib/arSolrPlugin.class.php
index 1b8d711aac..b971d1c76b 100644
--- a/plugins/arSolrPlugin/lib/arSolrPlugin.class.php
+++ b/plugins/arSolrPlugin/lib/arSolrPlugin.class.php
@@ -294,6 +294,10 @@ public function addDocument($data, $type)
         unset($data['id']);
     }
 
+    public function getClient() {
+      return $this->client;
+    }
+
     /**
      * Initialize Solr index if it does not exist.
      */
@@ -314,8 +318,17 @@ protected function initialize()
         $result = file_get_contents($url, false, $context);
         $response = json_decode($result);
 
+        $solrClientOptions = [
+            'hostname' => $this->solrClientOptions['hostname'],
+            'login' => $this->solrClientOptions['username'],
+            'password' => $this->solrClientOptions['password'],
+            'port' => $this->solrClientOptions['port'],
+            'path' => '/solr/'.$this->solrClientOptions['collection'],
+        ];
+
         if (array_search($this->solrClientOptions['collection'], $response->collections) !== false) {
             $this->log("Collection found. Not initializing");
+            $this->client = new SolrClient($solrClientOptions);
         } else {
             $this->log('Initializing Solr Index');
             if (
@@ -390,6 +403,7 @@ protected function initialize()
                     }
                 }
             }
+            $this->client = new SolrClient($solrClientOptions);
         }
     }
 
diff --git a/solr/bootstrap.php b/solr/bootstrap.php
deleted file mode 100644
index 8c00b30258..0000000000
--- a/solr/bootstrap.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
-<?php
-// MYSQL DB hostname
-define('SQL_SERVER_HOSTNAME', 'percona');
-
-// MYSQL DB port
-define('SQL_SERVER_PORT', 3306);
-
-// MYSQL DB database
-define('SQL_SERVER_DB', 'atom');
-
-// MYSQL DB username
-define('SQL_SERVER_USER', 'atom');
-
-// MYSQL DB password
-define('SQL_SERVER_PASSWORD', 'atom_12345');
-
-// Domain name of the Solr server
-define('SOLR_SERVER_HOSTNAME', 'solr1');
-
-// Whether or not to run in secure mode
-define('SOLR_SECURE', false);
-
-// HTTP Port to connection
-define('SOLR_SERVER_PORT', ((SOLR_SECURE) ? 8443 : 8983));
-
-// HTTP Basic Authentication Username
-define('SOLR_SERVER_USERNAME', 'solr');
-
-// HTTP Basic Authentication password
-define('SOLR_SERVER_PASSWORD', '');
-
-// Solr collection name
-define('SOLR_COLLECTION', 'atom');
-
-// HTTP connection timeout
-// This is maximum time in seconds allowed for the http data transfer operation. Default value is 30 seconds
-define('SOLR_SERVER_TIMEOUT', 10);
-
-// File name to a PEM-formatted private key + private certificate (concatenated in that order)
-define('SOLR_SSL_CERT', 'certs/combo.pem');
-
-// File name to a PEM-formatted private certificate only
-define('SOLR_SSL_CERT_ONLY', 'certs/solr.crt');
-
-// File name to a PEM-formatted private key
-define('SOLR_SSL_KEY', 'certs/solr.key');
-
-// Password for PEM-formatted private key file
-define('SOLR_SSL_KEYPASSWORD', 'StrongAndSecurePassword');
-
-// Name of file holding one or more CA certificates to verify peer with
-define('SOLR_SSL_CAINFO', 'certs/cacert.crt');
-
-// Name of directory holding multiple CA certificates to verify peer with
-define('SOLR_SSL_CAPATH', 'certs/');
-
-?>
diff --git a/solr/composer.json b/solr/composer.json
deleted file mode 100644
index 31840418c8..0000000000
--- a/solr/composer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "name": "atom/solr",
-    "description": "Project to test indexing atom db with solr",
-    "type": "project",
-    "license": "AGPL",
-    "require": {}
-}
diff --git a/solr/index.php b/solr/index.php
deleted file mode 100644
index 6c58249dec..0000000000
--- a/solr/index.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Solr AtoM demo</title>
-  <link href="reset.css" rel="stylesheet">
-  <link href="style.css" rel="stylesheet">
-</head>
-<body>
-  <section class="container">
-    <?php
-      include 'bootstrap.php';
-
-      $solrClientOptions = [
-          'hostname' => SOLR_SERVER_HOSTNAME,
-          'login' => SOLR_SERVER_USERNAME,
-          'password' => SOLR_SERVER_PASSWORD,
-          'port' => SOLR_SERVER_PORT,
-          'path' => '/solr/'.SOLR_COLLECTION,
-      ];
-
-      if ($solrClient = new SolrClient($solrClientOptions)) {
-          echo "<p class='info info--success info--solr-status'>Solr connected!</p>";
-      } else {
-          echo "<p class='info info--error info--solr-status'>Solr not connected. Click init to initialize collection</p>";
-      }
-    ?>
-
-    <form action="index.php" method="POST">
-      <div class="form-container">
-        <div class="form-row">
-          <label>
-            <span class='form-label'>Search</span>
-            <input class='form-text' type="text" name="query" placeholder="Search query" />
-            <input class='form-button' type="submit" name="search" value="Search"/>
-          </label>
-        </div>
-        <div class="form-row">
-          <input class='form-button' type="submit" name="index" value="Index" />
-          <input class='form-button' type="submit" name="reindex" value="Re-index" />
-          <input class='form-button' type="submit" name="delete" value="Delete" />
-          <input class='form-button' type="submit" name="init" value="Initialize collection" />
-          <input class='form-button' type="submit" name="addCopy" value="Add fields to copy" />
-        </div>
-      </div>
-    </form>
-
-    <?php
-      if ('POST' === $_SERVER['REQUEST_METHOD'] and isset($_POST['index'])) {
-          indexData($solrClient);
-      }
-
-      if ('POST' === $_SERVER['REQUEST_METHOD'] and isset($_POST['delete'])) {
-          deleteData($solrClient);
-      }
-
-      if ('POST' === $_SERVER['REQUEST_METHOD'] and isset($_POST['reindex'])) {
-          deleteData($solrClient);
-          indexData($solrClient);
-      }
-
-      if ('POST' === $_SERVER['REQUEST_METHOD'] and isset($_POST['search']) and isset($_POST['query'])) {
-          searchQuery($solrClient, $_POST['query']);
-      }
-
-      if ('POST' === $_SERVER['REQUEST_METHOD'] and isset($_POST['init'])) {
-          initializeCollection();
-      }
-
-      if ('POST' === $_SERVER['REQUEST_METHOD'] and isset($_POST['addCopy'])) {
-          $allFields = ['title', 'archivalHistory', 'scope', 'extent', 'acquisition'];
-          foreach ($allFields as $field) {
-              addToCopyField($field);
-          }
-      }
-
-      function initializeCollection()
-      {
-          $url = 'http://'.SOLR_SERVER_HOSTNAME.':'.SOLR_SERVER_PORT.'/solr/admin/collections?action=CREATE&name='.SOLR_COLLECTION.'&numShards=2&replicationFactor=1&wt=json';
-          echo "<p class='info info--log'>{$url}</p>";
-          $options = [
-              'http' => [
-                  'method' => 'GET',
-                  'header' => "Content-Type: application/json\r\n".
-                              "Accept: application/json\r\n",
-              ],
-          ];
-          $context = stream_context_create($options);
-          $result = file_get_contents($url, false, $context);
-          $response = json_decode($result);
-          echo "<p class='info info--notice'>";
-          print_r($response);
-          echo '</p>';
-
-          $url = 'http://'.SOLR_SERVER_HOSTNAME.':'.SOLR_SERVER_PORT.'/solr/'.SOLR_COLLECTION.'/schema/';
-          $addFieldQuery = '{"add-field": {"name": "all","stored": "false","type": "text_general","indexed": "true","multiValued": "true"}}';
-          echo "<p class='info info--log'>{$url}</p>";
-          $options = [
-              'http' => [
-                  'method' => 'POST',
-                  'content' => $addFieldQuery,
-                  'header' => "Content-Type: application/json\r\n".
-                              "Accept: application/json\r\n",
-              ],
-          ];
-          $context = stream_context_create($options);
-          $result = file_get_contents($url, false, $context);
-          $response = json_decode($result);
-          echo "<p class='info info--notice'>ADDING ALL FIELD";
-          print_r($response);
-          echo '</p>';
-
-          $url = 'http://'.SOLR_SERVER_HOSTNAME.':'.SOLR_SERVER_PORT.'/api/collections/'.SOLR_COLLECTION.'/config/';
-          $updateDefaultHandler = '{"update-requesthandler": {"name": "/select", "class": "solr.SearchHandler", "defaults": {"df": "all", "rows": 10, "echoParams": "explicit"}}}';
-          $options = [
-              'http' => [
-                  'method' => 'POST',
-                  'content' => $updateDefaultHandler,
-                  'header' => "Content-Type: application/json\r\n".
-                              "Accept: application/json\r\n",
-              ],
-          ];
-          $context = stream_context_create($options);
-          $result = file_get_contents($url, false, $context);
-          $response = json_decode($result);
-          echo "<p class='info info--notice'>Updating default field";
-          print_r($response);
-          echo '</p>';
-      }
-
-      function addToCopyField($field)
-      {
-          $url = 'http://'.SOLR_SERVER_HOSTNAME.':'.SOLR_SERVER_PORT.'/solr/'.SOLR_COLLECTION.'/schema/';
-          $copySourceDest = [
-              'add-copy-field' => [
-                  'source' => $field,
-                  'dest' => ['all'],
-              ],
-          ];
-          echo "<p class='info info--log'>{$url}</p>";
-          echo "<p class='info info--log'>";
-          echo json_encode($copySourceDest);
-          echo '</p>';
-          $options = [
-              'http' => [
-                  'method' => 'POST',
-                  'ignore_errors' => true,
-                  'content' => json_encode($copySourceDest),
-                  'header' => "Content-Type: application/json\r\n".
-                              "Accept: application/json\r\n",
-              ],
-          ];
-
-          $context = stream_context_create($options);
-          $result = file_get_contents($url, false, $context);
-          $response = json_decode($result);
-          echo "<p class='info info--notice'>SETTING {$field} TO COPY";
-          print_r($response);
-          echo '</p>';
-      }
-
-      function indexData($client)
-      {
-          // Create connection
-          $conn = mysqli_connect(SQL_SERVER_HOSTNAME, SQL_SERVER_USER, SQL_SERVER_PASSWORD, SQL_SERVER_DB, SQL_SERVER_PORT);
-
-          // Check connection
-          if ($conn->connect_error) {
-              exit("<p class='info info--error'>Connection failed: ".$conn->connect_error.'</p>');
-          }
-          echo "<p class='info info--warning'>MySQL Connected successfully!</p>";
-
-          // SQL Query string
-          $sql = 'select title t, archival_history ah, id, scope_and_content sc, extent_and_medium ext, acquisition aq from information_object_i18n LIMIT 1000';
-          if ($result = $conn->query($sql)) {
-              while ($row = $result->fetch_assoc()) {
-                  echo "<p class='info info--log'>${row['t']}</p>";
-                  $doc = new SolrInputDocument();
-                  $doc->addField('id', $row['id']);
-                  $doc->addField('title', $row['t']);
-                  $doc->addField('scope', $row['sc']);
-                  $doc->addField('extent', $row['ext']);
-                  $doc->addField('acquisition', $row['aq']);
-                  $doc->addField('archivalHistory', $row['ah']);
-                  $updateResponse = $client->addDocument($doc);
-                  echo "<p class='info info--notice'>";
-                  print_r($updateResponse->getResponse());
-                  echo '</p>';
-              }
-
-              // freeresultset
-              $result->free();
-          } else {
-              echo "<p class='info info--error'>No SQL results found in information_object_i18n</p>";
-          }
-          $conn->close();
-      }
-
-      function deleteData($client)
-      {
-          //This will erase the entire index
-          $deleteResponse = $client->deleteByQuery('*:*');
-          $client->commit();
-          echo "<p class='info info--notice'>";
-          print_r($deleteResponse->getResponse());
-          echo '</p>';
-      }
-
-      function searchQuery($client, $queryText)
-      {
-          $query = new SolrQuery();
-          $query->setQuery($queryText);
-
-          $query->setStart(0);
-          $query->setRows(1000);
-
-          $searchResponse = $client->query($query);
-
-          $response = $searchResponse->getResponse()->response;
-          if ($response->docs) {
-              foreach ($response->docs as $resp) {
-                  $title = $resp->title[0];
-                  $scope = $resp['scope'];
-                  $extent = $resp['extent'];
-                  $acquisition = $resp['acquisition'];
-                  $history = $resp['archivalHistory'];
-                  echo "<h2 class='title'>{$title}</h2>";
-                  if ($history) {
-                      echo "<p class='text'>{$history[0]}</p>";
-                  }
-                  if (!$scope && !$extent & !$acquisition) {
-                      continue;
-                  }
-                  echo "<section class='info-container'>";
-                  if ($scope) {
-                      echo "<h3 class='info-container__heading'>Scope</h3>";
-                      echo "<p class='info-container__detail'>{$scope[0]}</p>";
-                  }
-                  if ($extent) {
-                      echo "<h3 class='info-container__heading'>Extent</h3>";
-                      echo "<p class='info-container__detail'>{$extent[0]}</p>";
-                  }
-                  if ($acquisition) {
-                      echo "<h3 class='info-container__heading'>Acquisition</h3>";
-                      echo "<p class='info-container__detail'>{$acquisition[0]}</p>";
-                  }
-                  echo '</section>';
-              }
-          } else {
-              echo "<p class='info info--warning'>No results found</p>";
-          }
-      }
-    ?>
-  </section>
-</body>
-</html>
diff --git a/solr/reset.css b/solr/reset.css
deleted file mode 100644
index 38298f30e2..0000000000
--- a/solr/reset.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
-v2.0 | 20110126
-License: none (public domain)
- */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section {
-  display: block;
-}
-body {
-  line-height: 1;
-}
-ol, ul {
-  list-style: none;
-}
-blockquote, q {
-  quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-  content: '';
-  content: none;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
diff --git a/solr/style.css b/solr/style.css
deleted file mode 100644
index 03ea53f581..0000000000
--- a/solr/style.css
+++ /dev/null
@@ -1,88 +0,0 @@
-.container {
-  font-family: 'Helvetica', 'Arial', sans-serif;
-  margin: 1rem;
-}
-
-.form-container {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.form-row {
-  margin: 1rem 0;
-}
-
-.form-label {
-  margin-right: 0.5rem;
-}
-
-.form-text {
-  padding: 0.25rem 0.5rem;
-  border: 1.5px solid rgba(0, 0, 0, 0.25);
-  border-radius: 0.5rem;
-}
-
-.info {
-  font-size: 0.75rem;
-  padding: 0.5rem;
-  background: rgba(0, 0, 0, 0.75);
-}
-
-.info--log {
-  color: gray;
-}
-
-.info--success {
-  color: greenyellow;
-}
-
-.info--notice {
-  color: turquoise;
-}
-
-.info--warning {
-  color: goldenrod;
-}
-
-.info--error {
-  color: red;
-}
-
-.info--solr-status {
-  position: fixed;
-  bottom: 1rem;
-  right: 1rem;
-}
-
-.title {
-  font-weight: 700;
-  margin: 2rem 0 1rem;
-  font-size: 1.15rem;
-}
-
-.text {
-  max-width: 30%;
-  line-height: 1.5;
-}
-
-.info-container {
-  border: 1px solid rgba(100, 100, 100, 0.5);
-  border-radius: 0.25rem;
-  max-width: 30%;
-  margin: 0.5rem 0;
-  box-shadow: 3px 3px rgba(100, 100, 100, 0.35);
-}
-
-.info-container__heading {
-  padding: 0.5rem;
-  background: rgba(255, 136, 0, 0.5);
-}
-.info-container__detail {
-  padding: 0.5rem;
-  line-height: 1.25;
-}
-
-.info-container__detail:not(:last-of-type) {
-  border-bottom: 0.5px solid rgba(100, 100, 100, 0.25);
-}