diff --git a/.artifactory/pipelines.yml b/.artifactory/pipelines.yml
new file mode 100644
index 000000000..3e8890192
--- /dev/null
+++ b/.artifactory/pipelines.yml
@@ -0,0 +1,38 @@
+
+resources:
+  - name: featurebaseRepo
+    type: GitRepo
+    configuration:
+      # SCM integration where the repository is located
+      gitProvider: github_molecula_featurebase
+      # Repository path, including org name/repo name
+      path: molecula/featurebase
+      branches:
+        # Specifies which branches will trigger dependent steps
+        include: cicd
+  - name: featurebaseBuildInfo
+    type: BuildInfo
+    configuration:
+      sourceArtifactory: Molecula_Artifactory
+      buildName: featurebase_build
+      buildNumber: 4
+pipelines:
+  - name: ScanGoCode
+    steps:
+      - name: scan
+        type: XrayScan
+        configuration:
+          failOnScan: false
+          inputResources:
+            - name: featurebaseBuildInfo
+              trigger: true
+        execution:
+          onStart:
+            - echo "Preparing for work..."
+            - echo "Prepping build environment"
+          onSuccess:
+            - echo "Job well done!"
+          onFailure:
+            - echo "uh oh, something went wrong"
+          onComplete:
+            - echo "Cleaning up some stuff"
\ No newline at end of file
diff --git a/.cloudbuild/Dockerfile b/.cloudbuild/Dockerfile
new file mode 100644
index 000000000..407e5b994
--- /dev/null
+++ b/.cloudbuild/Dockerfile
@@ -0,0 +1,24 @@
+FROM alpine:3.14.2
+
+LABEL maintainer "dev@molecula.com"
+LABEL org.opencontainers.image.authors="dev@molecula.com"
+
+RUN apk add --no-cache curl jq
+
+COPY LICENSE /LICENSE
+COPY NOTICE /NOTICE
+ARG SHORT_SHA
+
+COPY .cloudbuild/featurebase_linux_amd64 /
+
+RUN mv /featurebase_linux_amd64 /pilosa
+RUN chmod ugo+x /pilosa
+EXPOSE 10101
+VOLUME /data
+
+ENV PILOSA_DATA_DIR /data
+ENV PILOSA_BIND 0.0.0.0:10101
+ENV PILOSA_BIND_GRPC 0.0.0.0:20101
+
+ENTRYPOINT ["/pilosa"]
+CMD ["server"]
diff --git a/.cloudbuild/LICENSE b/.cloudbuild/LICENSE
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/.cloudbuild/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/.cloudbuild/NOTICE b/.cloudbuild/NOTICE
new file mode 100644
index 000000000..594272a27
--- /dev/null
+++ b/.cloudbuild/NOTICE
@@ -0,0 +1,120 @@
+Software license
+================
+
+Copyright (C) 2017-2018 Pilosa Corp. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License").
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Third-party software licenses
+=============================
+
+The file /pilosa/lru/lru.go contains a redistribution of lru
+(github.com/golang/groupcache/lru); the license follows:
+
+    Copyright 2013 Google Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+The file /roaring/btree.go contains a modified redistribution of b
+(https://github.com/cznic/b); the license follows:
+
+    Copyright (c) 2014 The b Authors. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+       * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+       * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following disclaimer
+    in the documentation and/or other materials provided with the
+    distribution.
+       * Neither the names of the authors nor the names of the
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The file /server/tlsconfig.go contains a modified redistribution of bridge 
+(https://github.com/robustirc/bridge); the license follows:
+  
+    Copyright © 2014-2015 The RobustIRC Authors. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+
+        * Redistributions in binary form must reproduce the above copyright
+          notice, this list of conditions and the following disclaimer in the
+          documentation and/or other materials provided with the distribution.
+
+        * Neither the name of RobustIRC nor the names of contributors may be used
+          to endorse or promote products derived from this software without
+          specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The files /logger/filewriter.go and /logger/filewriter_test.go contain a modified redistribution of reopen (github.com/client9/reopen); the license follows:
+
+    The MIT License (MIT)
+
+    Copyright (c) 2015 Nick Galbreath
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
diff --git a/.cloudbuild/cloudbuild.yml b/.cloudbuild/cloudbuild.yml
new file mode 100644
index 000000000..4ec21187a
--- /dev/null
+++ b/.cloudbuild/cloudbuild.yml
@@ -0,0 +1,202 @@
+steps:
+  - name: gcr.io/cloud-builders/yarn
+    args:
+      - install
+    dir: lattice/
+    id: Install Lattice
+    waitFor:
+      - '-'
+  - name: gcr.io/cloud-builders/yarn
+    args:
+      - build
+    dir: lattice/
+    id: Build Lattice
+    waitFor:
+      - Install Lattice
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    args:
+      - tar
+      - '-c'
+      - '-z'
+      - '-v'
+      - '-f'
+      - lattice.tar.gz
+      - lattice/build
+    id: Package Lattice Build
+    waitFor:
+      - Build Lattice
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    args:
+      - mv
+      - lattice.tar.gz
+      - /cache/
+    waitFor:
+      - Package Lattice Build
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    args:
+      - go
+      - test
+      - '-covermode=atomic'
+      - '-coverprofile=/cache/coverage.out'
+    id: Generate code coverage report
+    waitFor:
+      - '-'
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    args:
+      - '-c'
+      - |
+        go test -json > /cache/test-report.out
+    id: Generate test report
+    waitFor:
+      - '-'
+    entrypoint: bash
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    args:
+      - go
+      - tool
+      - cover
+      - '-html'
+      - /cache/coverage.out
+      - '-o'
+      - /cache/coverage.html
+    id: Calculate Coverage
+    waitFor:
+      - Generate code coverage report
+  - name: 'sonarsource/sonar-scanner-cli:4.6'
+    args:
+      - '-Dsonar.projectKey=molecula_featurebase'
+      - '-Dsonar.organization=molecula'
+      - '-Dsonar.sources=.'
+      - '-Dsonar.host.url=https://sonarcloud.io'
+      - '-Dsonar.go.coverage.reportPaths=/cache/coverage.out'
+      - '-Dsonar.go.tests.reportPaths=/cache/test-report.out'
+    id: SonarCloud
+    waitFor:
+      - Calculate Coverage
+    secretEnv:
+      - SONAR_TOKEN
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    args:
+      - jfrog
+      - config
+      - add
+      - molecula
+      - '--interactive=false'
+      - '--artifactory-url=https://molecula.jfrog.io/'
+      - '--access-token=$$JFROG_API_TOKEN'
+    secretEnv:
+      - JFROG_API_TOKEN
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    env:
+      - GOOS=linux
+      - GOARCH=amd64
+    args:
+      - go
+      - build
+      - '-o'
+      - /cache/featurebase_linux_amd64
+      - ./cmd/featurebase
+    id: Build for Linux amd64
+    waitFor:
+      - '-'
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    env:
+      - GOOS=darwin
+      - GOARCH=amd64
+    args:
+      - go
+      - build
+      - '-o'
+      - /cache/featurebase_darwin_amd64
+      - ./cmd/featurebase
+    id: Build for Darwin amd64
+    waitFor:
+      - '-'
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    env:
+      - GOOS=linux
+      - GOARCH=arm64
+    args:
+      - go
+      - build
+      - '-o'
+      - /cache/featurebase_linux_arm64
+      - ./cmd/featurebase
+    id: Build for Linux arm64
+    waitFor:
+      - '-'
+  - name: 'us.gcr.io/featurebase-pipeline-dev/featurebase:0.3'
+    env:
+      - GOOS=darwin
+      - GOARCH=arm64
+    args:
+      - go
+      - build
+      - '-o'
+      - /cache/featurebase_darwin_arm64
+      - ./cmd/featurebase
+    id: Build for Darwin arm64
+    waitFor:
+      - '-'
+  - name: gcr.io/cloud-builders/gsutil
+    args:
+      - '-c'
+      - >
+        gsutil -m cp -r '/cache/*'
+        "gs://molecula-pipeline/featurebase/dev/$SHORT_SHA/"
+    id: Upload Binaries by Short SHA
+    waitFor:
+      - Package Lattice Build
+      - Calculate Coverage
+      - Build for Linux amd64
+      - Build for Darwin amd64
+      - Build for Linux arm64
+      - Build for Darwin arm64
+    entrypoint: bash
+  - name: gcr.io/cloud-builders/gsutil
+    args:
+      - '-c'
+      - >
+        gsutil -m cp -r '/cache/*'
+        "gs://molecula-pipeline/featurebase/dev/$BRANCH_NAME/"
+    id: Upload Binaries by Branch Name
+    waitFor:
+      - Package Lattice Build
+      - Calculate Coverage
+      - Build for Linux amd64
+      - Build for Darwin amd64
+      - Build for Linux arm64
+      - Build for Darwin arm64
+    entrypoint: bash
+  - name: gcr.io/cloud-builders/docker
+    args:
+      - '-c'
+      - >
+        cp -v /cache/* .cloudbuild/ && docker build  --build-arg
+        SHORT_SHA=$SHORT_SHA  -t
+        northamerica-northeast1-docker.pkg.dev/featurebase-pipeline-dev/featurebase/main:$SHORT_SHA
+        -f .cloudbuild/Dockerfile .
+    id: Build Linux amd Container
+    entrypoint: bash
+  - name: gcr.io/cloud-builders/docker
+    args:
+      - push
+      - >-
+        northamerica-northeast1-docker.pkg.dev/featurebase-pipeline-dev/featurebase/main:$SHORT_SHA
+    waitFor:
+      - Build Linux amd Container
+timeout: 1200s
+logsBucket: 'gs://molecula-pipeline/logs'
+options:
+  volumes:
+    - name: data
+      path: /cache
+  pool:
+    name: >-
+      projects/featurebase-pipeline-dev/locations/us-central1/workerPools/test-pool-00
+availableSecrets:
+  secretManager:
+    - versionName: projects/903994035405/secrets/jfrog-admin-token/versions/1
+      env: JFROG_API_TOKEN
+    - versionName: projects/903994035405/secrets/sonarcloud-featurebase-token/versions/1
+      env: SONAR_TOKEN
diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
new file mode 100644
index 000000000..af84a9467
--- /dev/null
+++ b/.gitlab/.gitlab-ci.yml
@@ -0,0 +1,18 @@
+image: golang:1.16.3-stretch
+
+stages:
+  - test
+
+format:
+  stage: test
+  script:
+    - echo "Testing code formatting..."
+    - go fmt 
+  allow_failure: true
+  
+run-tests:
+  stage: test
+  script:
+    - echo "Running unit tests..."
+    - go test
+  allow_failure: true
\ No newline at end of file
diff --git a/cmd/backup.go b/cmd/backup.go
index 68baeb014..d81029d7a 100644
--- a/cmd/backup.go
+++ b/cmd/backup.go
@@ -40,6 +40,7 @@ Backs up a FeatureBase server to a local, tar-formatted snapshot file.
 	flags.BoolVar(&cmd.NoSync, "no-sync", false, "disable file sync")
 	flags.IntVar(&cmd.Concurrency, "concurrency", cmd.Concurrency, "number of concurrent backup goroutines")
 	flags.StringVar(&cmd.Host, "host", "localhost:10101", "host:port of FeatureBase.")
+	flags.StringVar(&cmd.Index, "index", "", "index to backup, default backs up all indexes. ")
 	ctl.SetTLSConfig(flags, "", &cmd.TLS.CertificatePath, &cmd.TLS.CertificateKeyPath, &cmd.TLS.CACertPath, &cmd.TLS.SkipVerify, &cmd.TLS.EnableClientVerification)
 	return ccmd
 }
diff --git a/ctl/backup.go b/ctl/backup.go
index e68ce52d2..cdcfb1427 100644
--- a/ctl/backup.go
+++ b/ctl/backup.go
@@ -24,7 +24,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/molecula/featurebase/v2"
+	pilosa "github.com/molecula/featurebase/v2"
 	"github.com/molecula/featurebase/v2/http"
 	"github.com/molecula/featurebase/v2/server"
 	"github.com/molecula/featurebase/v2/topology"
@@ -38,6 +38,9 @@ type BackupCommand struct { // nolint: maligned
 	// Destination host and port.
 	Host string `json:"host"`
 
+	// Optional Index filter
+	Index string `json:"index"`
+
 	// Path to write the backup to.
 	OutputDir string
 
@@ -91,6 +94,19 @@ func (cmd *BackupCommand) Run(ctx context.Context) (err error) {
 	if err != nil {
 		return fmt.Errorf("getting schema: %w", err)
 	}
+	if cmd.Index != "" {
+		for _, idx := range indexes {
+			if idx.Name == cmd.Index {
+				indexes = make([]*pilosa.IndexInfo, 0)
+				indexes = append(indexes, idx)
+				break
+			}
+		}
+		if len(indexes) <= 0 {
+			return fmt.Errorf("Index not found to back up")
+		}
+	}
+
 	schema := &pilosa.Schema{Indexes: indexes}
 
 	// Ensure output directory doesn't exist; then create output directory.
diff --git a/ctl/restore.go b/ctl/restore.go
index 26d72c788..87d4d3c87 100644
--- a/ctl/restore.go
+++ b/ctl/restore.go
@@ -17,6 +17,7 @@ package ctl
 import (
 	"context"
 	"crypto/tls"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -26,7 +27,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/molecula/featurebase/v2"
+	pilosa "github.com/molecula/featurebase/v2"
 	"github.com/molecula/featurebase/v2/server"
 	"github.com/molecula/featurebase/v2/topology"
 	"golang.org/x/sync/errgroup"
@@ -102,7 +103,6 @@ func (cmd *RestoreCommand) Run(ctx context.Context) (err error) {
 	} else if err := cmd.restoreIDAlloc(ctx, primary); err != nil {
 		return fmt.Errorf("cannot restore idalloc: %w", err)
 	}
-
 	if err := cmd.restoreShards(ctx); err != nil {
 		return fmt.Errorf("cannot restore shards: %w", err)
 	} else if err := cmd.restoreIndexTranslation(ctx); err != nil {
@@ -128,11 +128,47 @@ func (cmd *RestoreCommand) restoreSchema(ctx context.Context, primary *topology.
 	}
 	defer f.Close()
 
-	cmd.Logger().Printf("Load Schema")
-	url := primary.URI.Path("/schema")
-
-	var client http.Client
-	_, err = client.Post(url, "application/json", f)
+	existingSchema, err := cmd.client.Schema(ctx)
+	if len(existingSchema) == 0 {
+		cmd.Logger().Printf("Load Schema")
+		url := primary.URI.Path("/schema")
+		var client http.Client
+		_, err = client.Post(url, "application/json", f)
+	} else {
+		schema := &pilosa.Schema{}
+		if err := json.NewDecoder(f).Decode(schema); err != nil {
+			if err != nil {
+				return err
+			}
+		}
+		exists := func(indexName string) bool {
+			for _, i := range existingSchema {
+				if i.Name == indexName {
+					return true
+				}
+			}
+			return false
+		}
+		logger := cmd.Logger()
+		//NOTE SHOULD ONLY BE ONE
+		for _, index := range schema.Indexes {
+			if exists(index.Name) {
+				return fmt.Errorf("Index Exists %v", index.Name)
+			}
+			logger.Printf("Create INDEX %v", index.Name)
+			err = cmd.client.CreateIndex(ctx, index.Name, index.Options)
+			if err != nil {
+				return err
+			}
+			for _, field := range index.Fields {
+				logger.Printf("Create Field %v", field.Name)
+				err = cmd.client.CreateFieldWithOptions(ctx, index.Name, field.Name, field.Options)
+				if err != nil {
+					return err
+				}
+			}
+		}
+	}
 	return err
 }
 
diff --git a/testBackupRestore.sh b/testBackupRestore.sh
index 6d0dbc67f..7bcbe3894 100755
--- a/testBackupRestore.sh
+++ b/testBackupRestore.sh
@@ -33,3 +33,25 @@ else
 	echo "FAIL Single"
 	exit 1
 fi
+
+datagen --source texas_health -e 9999 --pilosa.index newsink --pilosa.batch-size 10000 --pilosa.hosts pilosa0:10101
+before=$(/featurebase chksum --host pilosa0:10101)
+/featurebase backup -o newbackupdir --host pilosa0:10101 --index newsink
+curl -X DELETE -s pilosa0:10101/index/newsink
+/featurebase restore -s newbackupdir --host pilosa0:10101
+after=$(/featurebase chksum --host pilosa0:10101)
+if [ "$before" = "$after" ]; then
+	echo "PASS Cluster Table"
+else
+	echo "FAIL Single Table"
+	exit 1
+fi
+/featurebase restore -s newbackupdir --host pilosax:10101
+single=$(/featurebase chksum --host pilosax:10101)
+if [ "$before" = "$single" ]; then
+	echo "PASS Single Table"
+	exit 0
+else
+	echo "FAIL Single Table"
+	exit 1
+fi