diff --git a/.env-sample b/.env-sample
index 64d4c94c2..975f32677 100644
--- a/.env-sample
+++ b/.env-sample
@@ -21,6 +21,8 @@ CACHE_PROVIDER=memory
 CACHE_DEFAULT_TTL=21600
 # redis connection string - e.g redis://user:password@redis-service.com:6379/
 CACHE_REDIS_CONNECTION_STRING=
+# redis graph expiry timer in seconds
+REDIS_GRAPH_TTL=3600
 
 CACHE_GRAPHQL=true
 
diff --git a/API Documentation/Core.swagger_collection.yaml b/API Documentation/Core.swagger_collection.yaml
index 8b89c836c..939697e9c 100644
--- a/API Documentation/Core.swagger_collection.yaml	
+++ b/API Documentation/Core.swagger_collection.yaml	
@@ -220,6 +220,219 @@ paths:
               schema:
                 $ref: '#/components/schemas/Generic200Response'
       deprecated: false
+  '/containers/{container_id}/data_source_templates':
+    get:
+      tags:
+        - Containers
+      summary: List Data Source Templates
+      description: List all Data Source Templates for the container.
+      operationId: RetrieveContainer
+      parameters:
+        - name: container_id
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  value:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        id:
+                          type: string
+                        name:
+                          type: string
+                        encrypted:
+                          type: boolean
+                        authorized:
+                          type: boolean
+                        custom_fields:
+                          type: array
+                          items:
+                            type: object
+                            properties:
+                              name:
+                                type: string
+                              value:
+                                type: string
+                              encrypt:
+                                type: boolean
+                              required:
+                                type: boolean
+                        redirect_address:
+                          type: string
+                  isError:
+                    type: boolean
+                x-examples:
+                  Example 1:
+                    value:
+                      - id: 98eb71e9-2556-4309-824b-068be12650c9
+                        name: P6
+                        encrypted: true
+                        authorized: false
+                        custom_fields:
+                          - name: encrypted
+                            value: OVTPjwWPZNdAvkkxZseu448ZrrdpjLshMmJZ2BF5HYRobkmb91ZWZimOVwU6VeGT6hc1PABdvMXVHi0nRl7cfw==
+                            encrypt: true
+                            required: true
+                          - name: no value
+                            encrypt: false
+                            required: false
+                          - name: unencrypted
+                            value: unencrypted
+                        redirect_address: 'localhost:8181'
+                      - id: 87da60d8-1445-3298-713a-957ad01549b8
+                        name: Jazz
+                        encrypted: true
+                        authorized: false
+                        redirect_address: 'localhost:8282'
+                    isError: false
+              examples:
+                Example 1:
+                  value:
+                    value:
+                      - id: 98eb71e9-2556-4309-824b-068be12650c9
+                        name: P6
+                        encrypted: true
+                        authorized: false
+                        custom_fields:
+                          - name: encrypted
+                            value: OVTPjwWPZNdAvkkxZseu448ZrrdpjLshMmJZ2BF5HYRobkmb91ZWZimOVwU6VeGT6hc1PABdvMXVHi0nRl7cfw==
+                            encrypt: true
+                            required: true
+                          - name: no value
+                            encrypt: false
+                            required: false
+                          - name: unencrypted
+                            value: unencrypted
+                        redirect_address: 'localhost:8181'
+                      - id: 87da60d8-1445-3298-713a-957ad01549b8
+                        name: Jazz
+                        encrypted: true
+                        authorized: false
+                        redirect_address: 'localhost:8282'
+                    isError: false
+        '500':
+          description: Internal Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+      deprecated: false
+    parameters:
+      - schema:
+          type: string
+        name: container_id
+        in: path
+        required: true
+    post:
+      summary: Save Data Source Templates
+      operationId: post-containers-container_id-data_source_templates
+      description: Add a new Data Source Template to the container or create a new Data Source Template.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                type: object
+                properties:
+                  id:
+                    type: string
+                  name:
+                    type: string
+                  redirect_address:
+                    type: string
+                  custom_fields:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                        encrypt:
+                          type: boolean
+                        required:
+                          type: boolean
+                        value:
+                          type: string
+              x-examples:
+                Example 1:
+                  - id: 98eb71e9-2556-4309-824b-068be12650c9
+                    name: P6
+                    redirect_address: 'localhost:8181'
+                    custom_fields:
+                      - name: encrypted
+                        encrypt: true
+                        required: true
+                        value: encrypted
+                      - name: no value
+                        required: false
+                        encrypt: false
+                      - name: unencrypted
+                        value: unencrypted
+                  - id: 87da60d8-1445-3298-713a-957ad01549b8
+                    name: Jazz
+                    redirect_address: 'localhost:8282'
+            examples:
+              Example 1:
+                value:
+                  - id: 98eb71e9-2556-4309-824b-068be12650c9
+                    name: P6
+                    redirect_address: 'localhost:8181'
+                    custom_fields:
+                      - name: encrypted
+                        encrypt: true
+                        required: true
+                        value: encrypted
+                      - name: no value
+                        required: false
+                        encrypt: false
+                      - name: unencrypted
+                        value: unencrypted
+                  - id: 87da60d8-1445-3298-713a-957ad01549b8
+                    name: Jazz
+                    redirect_address: 'localhost:8282'
+  '/containers/{container_id}/data_source_templates/{template_id}':
+    delete:
+      tags:
+        - Containers
+      summary: Delete Data Source Template
+      description: Deletes a Data Source Template based on its UUID as supplied in the route.
+      operationId: ArchiveContainer
+      parameters:
+        - name: container_id
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Generic200Response'
+      deprecated: false
+    parameters:
+      - schema:
+          type: string
+        name: container_id
+        in: path
+        required: true
+      - schema:
+          type: string
+        name: template_id
+        in: path
+        required: true
   '/containers/{container_id}/active':
     post:
       tags:
diff --git a/AdminWebApp/src/api/client.ts b/AdminWebApp/src/api/client.ts
index 812990bb7..921164dad 100644
--- a/AdminWebApp/src/api/client.ts
+++ b/AdminWebApp/src/api/client.ts
@@ -34,6 +34,7 @@ import {
     TagT,
     TimeseriesRange,
     TimeseriesRowCount,
+    DataSourceTemplateT,
 } from '@/api/types';
 import {RetrieveJWT} from '@/auth/authentication_service';
 import {UserT} from '@/auth/types';
@@ -705,6 +706,18 @@ export class Client {
         return this.post<EdgeT[]>(`/containers/${containerID}/graphs/nodes/edges`, {node_ids: nodeIDS}, query);
     }
 
+    listDataSourceTemplates(containerID: string): Promise<DataSourceTemplateT[]> {
+        return this.get(`/containers/${containerID}/data_source_templates`);
+    }
+
+    saveDataSourceTemplates(containerID: string, templates: any[]): Promise<boolean> {
+        return this.post(`/containers/${containerID}/data_source_templates`, templates);
+    }
+
+    deleteDataSourceTemplate(containerID: string, templateID: string): Promise<boolean> {
+        return this.delete(`/containers/${containerID}/data_source_templates/${templateID}`);
+    }
+
     listDataSources(containerID: string, archived = false, timeseries = false): Promise<DataSourceT[]> {
         // we hardcoded the sortBy to insure we're always getting archived data sources at the bottom of the list
         return this.get<DataSourceT[]>(`/containers/${containerID}/import/datasources`, {archived, sortBy: 'archived', timeseries});
diff --git a/AdminWebApp/src/api/types.ts b/AdminWebApp/src/api/types.ts
index f3fae3cc6..f6fffaf7c 100644
--- a/AdminWebApp/src/api/types.ts
+++ b/AdminWebApp/src/api/types.ts
@@ -94,12 +94,12 @@ export type MetatypeKeyT = {
     data_type: 'number' | 'number64' | 'float' | 'float64' | 'date' | 'string' | 'boolean' | 'enumeration' | 'file';
     archived: boolean;
     validation:
-    | {
-        regex: string;
-        min: number;
-        max: number;
-    }
-    | undefined;
+        | {
+              regex: string;
+              min: number;
+              max: number;
+          }
+        | undefined;
     options: string[] | undefined;
     default_value: string | boolean | number | any[] | undefined;
     created_at?: string;
@@ -237,7 +237,13 @@ export type DataSourceT = {
     adapter_type: string | undefined;
     active: boolean;
     archived?: boolean;
-    config: StandardDataSourceConfig | HttpDataSourceConfig | AvevaDataSourceConfig | TimeseriesDataSourceConfig | P6DataSourceConfig | undefined;
+    config: StandardDataSourceConfig 
+        | HttpDataSourceConfig 
+        | AvevaDataSourceConfig 
+        | TimeseriesDataSourceConfig 
+        | P6DataSourceConfig 
+        | CustomDataSourceConfig
+        | undefined;
     created_at?: string;
     modified_at?: string;
     created_by?: string;
@@ -343,6 +349,31 @@ export type P6DataSourceConfig = {
     raw_retention_enabled?: boolean;
 };
 
+export type CustomDataSourceConfig = {
+    kind: 'custom';
+    template: DataSourceTemplateT;
+    stop_nodes?: string[];
+    value_nodes?: string[];
+    data_retention_days?: number;
+    raw_retention_enabled?: boolean;
+};
+
+export type DataSourceTemplateT = {
+    id?: string;
+    name: string;
+    custom_fields?: CustomTemplateFieldT[];
+    redirect_address: string;
+    authorized?: boolean;
+    saveable?: boolean;
+};
+
+export type CustomTemplateFieldT = {
+    name: string;
+    value?: string;
+    encrypt?: boolean;
+    required?: boolean;
+};
+
 export type EventActionT = {
     id?: string;
     container_id?: string;
@@ -504,6 +535,7 @@ export type TypeMappingTransformationT = {
     created_at_key?: string;
     created_at_format_string?: string;
     tags?: TypeMappingTransformationTagT[];
+    merge?: boolean;
 };
 
 export type TypeMappingTransformationPayloadT = {
@@ -805,3 +837,18 @@ export function DefaultTimeseriesDataSourceConfig(): TimeseriesDataSourceConfig
         fast_load_enabled: true,
     };
 }
+
+export function DefaultCustomDataSourceConfig(): CustomDataSourceConfig {
+    return {
+        kind: 'custom',
+        template: DefaultDataSourceTemplate()
+    };
+}
+
+export function DefaultDataSourceTemplate(): DataSourceTemplateT {
+    return {
+        name: '',
+        custom_fields: [],
+        redirect_address: ''
+    }
+}
\ No newline at end of file
diff --git a/AdminWebApp/src/components/dataSources/CustomAdapterActions.vue b/AdminWebApp/src/components/dataSources/CustomAdapterActions.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/AdminWebApp/src/components/dataSources/DataSourceActions.vue b/AdminWebApp/src/components/dataSources/DataSourceActions.vue
index 6d658f253..24386fea8 100644
--- a/AdminWebApp/src/components/dataSources/DataSourceActions.vue
+++ b/AdminWebApp/src/components/dataSources/DataSourceActions.vue
@@ -38,7 +38,7 @@
             disabled
           />
 
-          <!-- Description Predecessors (P6 and TS only) -->
+          <!-- Description Predecessors (Custom, P6 and TS only) -->
           <template v-if="mode === 'create' 
             && newDataSource.adapter_type === 'p6'
             && checkConfiguredP6()"
@@ -445,6 +445,30 @@
             />
           </template>
 
+          <!-- Custom -->
+          <template v-if="newDataSource.adapter_type === 'custom'">
+            <!-- Allow users to choose an existing template to start from, or create a new one -->
+            <v-row>
+              <v-col>
+                <SelectDataSourceTemplate v-if="mode === 'create'"
+                  :containerID="containerID"
+                  :noIndent="true"
+                  :includeBlank="true"
+                  @selected="setTemplate"
+                />
+              </v-col>
+            </v-row>
+            <!-- We use a component for this since it needs to be used both here and on the container level -->
+            <DataSourceTemplateCard v-if="showTemplateCard"
+              :mode="mode"
+              type="dataSource"
+              :template="newTemplate"
+              :saveOption="saveTemplateOption"
+              :key="newTemplate.name"
+              @validationUpdated="setTemplateValidation"
+            />
+          </template>
+
           <!-- Data Retention and additional settings -->
           <template v-if="newDataSource.adapter_type && newDataSource.adapter_type !== 'timeseries'">
             <!-- Attach Data Staging records -->
@@ -637,6 +661,7 @@
     AvevaDataSourceConfig, 
     ContainerT, 
     DataSourceT, 
+    DataSourceTemplateT, 
     DefaultAvevaDataSourceConfig, 
     DefaultHttpDataSourceConfig,
     DefaultP6DataSourceConfig, 
@@ -647,8 +672,13 @@
     StandardDataSourceConfig, 
     TimeseriesColumn, 
     TimeseriesDataSourceConfig,
+    CustomDataSourceConfig,
+    DefaultCustomDataSourceConfig,
+    DefaultDataSourceTemplate
   } from '@/api/types';
   import {v4 as uuidv4} from 'uuid';
+  import DataSourceTemplateCard from './dataSourceTemplates/DataSourceTemplateCard.vue';
+  import SelectDataSourceTemplate from './dataSourceTemplates/SelectDataSourceTemplate.vue';
 
   interface DataSourceActionsModel {
     config: {
@@ -671,6 +701,7 @@
     avevaConfig: AvevaDataSourceConfig
     p6config: P6DataSourceConfig
     timeseriesConfig: TimeseriesDataSourceConfig
+    customConfig: CustomDataSourceConfig
     select_auth: string
     hidePass: boolean
     expandedTimeSeries: TimeseriesColumn[]
@@ -687,12 +718,16 @@
     auth_methods: {text: string, value: string}[]
     defaultFormatString: string
     timeseriesErrors: any[]
+    newTemplate: DataSourceTemplateT
+    templateSelected: boolean
+    saveTemplateOption: boolean
+    validTemplate: boolean
   }
 
   export default Vue.extend({
     name: 'DataSourceActions',
 
-    components: { DialogBasic, NodeAttachmentParameterDialog },
+    components: { DialogBasic, NodeAttachmentParameterDialog, DataSourceTemplateCard, SelectDataSourceTemplate },
 
     props: {
       mode: {type: String, required: true},
@@ -721,6 +756,7 @@
       avevaConfig: DefaultAvevaDataSourceConfig(),
       p6config: DefaultP6DataSourceConfig(),
       timeseriesConfig: DefaultTimeseriesDataSourceConfig(),
+      customConfig: DefaultCustomDataSourceConfig(),
       select_auth: "",
       hidePass: true,
       expandedTimeSeries: [],
@@ -750,6 +786,10 @@
       auth_methods: [{text: "Basic", value: 'basic'}, {text: "Token", value: 'token'}],
       defaultFormatString: '%Y-%m-%d %H:%M:%S.%f',
       timeseriesErrors: [],
+      newTemplate: DefaultDataSourceTemplate(),
+      templateSelected: false,
+      saveTemplateOption: false,
+      validTemplate: false,
     }),
 
     beforeMount() {
@@ -803,6 +843,9 @@
       },
       fastloadComputed() {
         return this.fastload;
+      },
+      showTemplateCard(): boolean {
+        return (this.mode === 'create' && this.templateSelected) || this.mode === 'edit';
       }
     },
 
@@ -820,20 +863,8 @@
 
     methods: {
       getSourceDescription(sourceType?: string) {
-        switch (sourceType) {
-          case "standard": {
-            return this.$t('dataSources.standardDescription');
-          }
-          case "http": {
-            return this.$t('dataSources.httpDescription');
-          }
-          case "aveva": {
-            return this.$t('dataSources.avevaDescription');
-          }
-          case "p6": {
-            return this.$t('dataSources.p6Description');
-          }
-        }
+        const types = this.getSourceTypes(false);
+        return types.filter(t => t.value === sourceType)[0].description;
       },
       validateRequired(value: any) {
         return !!value || this.$t('validation.required');
@@ -843,7 +874,8 @@
           {text: this.$t('dataSources.standardName'), value: 'standard', description: this.$t('dataSources.standardDescription')},
           {text: this.$t('dataSources.httpName'), value: 'http', description: this.$t('dataSources.httpDescription')},
           {text: this.$t('dataSources.avevaName'), value: 'aveva', description: this.$t('dataSources.avevaDescription')},
-          {text: this.$t('dataSources.p6Name'), value: 'p6', description: this.$t('dataSources.p6description')}
+          {text: this.$t('dataSources.p6Name'), value: 'p6', description: this.$t('dataSources.p6Description')},
+          {text: this.$t('dataSources.customName'), value: 'custom', description: this.$t('dataSources.customDescription')},
         ]
 
         if (timeseries) {
@@ -900,6 +932,15 @@
           }
         }
       },
+      // custom source functions
+      setTemplate(t: DataSourceTemplateT) {
+        this.newTemplate = t;
+        this.templateSelected = true;
+        this.saveTemplateOption = !!t.saveable;
+      },
+      setTemplateValidation(valid: boolean) {
+        this.validTemplate = valid;
+      },
       // returns label that indicates sensitive info is removed if edit mode
       editLabel(label: string): string {
         if (this.mode === 'edit') {
@@ -1107,8 +1148,11 @@
           this.avevaConfig = DefaultAvevaDataSourceConfig();
           this.p6config = DefaultP6DataSourceConfig();
           this.timeseriesConfig = DefaultTimeseriesDataSourceConfig();
+          this.customConfig = DefaultCustomDataSourceConfig();
           this.stopNodes = [];
           this.valueNodes = [];
+          this.templateSelected = false;
+          this.saveTemplateOption = false;
         }
 
         // we need to reset the config for the specific data source type this is if edit mode
@@ -1139,6 +1183,12 @@
               this.avevaConfig = Object.assign({}, this.dataSource.config) as AvevaDataSourceConfig;
               break;
             }
+
+            case "custom": {
+              this.customConfig = Object.assign({}, this.dataSource.config) as CustomDataSourceConfig;
+              this.newTemplate = this.customConfig.template;
+              break;
+            }
           }
 
           this.stopNodes = this.dataSource.config!.stop_nodes ? this.dataSource.config?.stop_nodes! : [];
@@ -1171,6 +1221,12 @@
             break;
           }
 
+          case "custom": {
+            this.customConfig.template = this.newTemplate!;
+            this.newDataSource.config = this.customConfig;
+            break;
+          }
+
           case "timeseries": {
             this.timeseriesConfig.fast_load_enabled = this.fastload;
             this.newDataSource.config = this.timeseriesConfig;
diff --git a/AdminWebApp/src/components/dataSources/DataSourceTable.vue b/AdminWebApp/src/components/dataSources/DataSourceTable.vue
new file mode 100644
index 000000000..8d6efd555
--- /dev/null
+++ b/AdminWebApp/src/components/dataSources/DataSourceTable.vue
@@ -0,0 +1,182 @@
+<template>
+  <v-data-table
+    :headers="headers()"
+    :items="dataSources"
+    :loading="loading"
+    class="elevation-1"
+    :search="search"
+  >
+    <template v-slot:top>
+      <v-toolbar flat color="white">
+        <v-toolbar-title>{{$t('dataSources.description')}}</v-toolbar-title>
+        <v-spacer></v-spacer>
+        <DataSourceActions
+          :icon="false"
+          mode="create"
+          :containerID="containerID"
+          @dataSourceCreated="refreshDataSources()"
+        />
+
+        <template v-slot:extension>
+          <v-text-field
+            v-model="search"
+            prepend-icon="mdi-magnify"
+            :label="$t('general.search')"
+            single-line
+            hide-details
+          ></v-text-field>
+        </template>
+
+      </v-toolbar>
+    </template>
+    <template v-slot:[`item.copy`]="{ item }">
+      <v-tooltip top>
+        <template v-slot:activator="{on, attrs}">
+          <v-icon v-bind="attrs" v-on="on" @click="copyID(item.id)">{{copy}}</v-icon>
+        </template>
+        <span>{{$t('general.copyID')}}</span>
+        <span>{{item.id}}</span>
+      </v-tooltip>
+    </template>
+    <template v-slot:[`item.name`]="{ item }">
+      <span v-if="!item.archived">{{item.name}}</span>
+      <span v-else class="text--disabled">{{item.name}}</span>
+    </template>
+    <template v-slot:[`item.adapter_type`]="{ item }">
+      <span v-if="!item.archived">{{item.adapter_type}}</span>
+      <span v-else class="text--disabled">{{item.adapter_type}}</span>
+    </template>
+    <template v-slot:[`item.active`]="{ item }">
+      <v-switch
+        v-if="!item.archived"
+        @change="toggleDataSourceActive(item)"
+        v-model="item.active"
+        class="mt-0"
+        hide-details
+      />
+      <v-switch
+        v-else
+        :value="false"
+        class="mt-0"
+        hide-details
+        disabled
+      />
+    </template>
+    <template v-slot:[`item.actions`]="{ item }">
+      <DataSourceActions
+        mode="edit"
+        :icon="true"
+        :containerID="containerID"
+        :dataSource="item"
+        @dataSourceUpdated="refreshDataSources"
+      />
+      <DataSourceActions
+        mode="delete"
+        :icon="true"
+        @dataSourceArchived="refreshDataSources()"
+        @dataSourceDeleted="refreshDataSources()"
+        :containerID="item.container_id"
+        :dataSource="item"
+      />
+      <DataSourceActions
+        v-if="!item.archived"
+        mode="archive"
+        :icon="true"
+        @dataSourceArchived="refreshDataSources()"
+        :containerID="item.container_id"
+        :dataSource="item"
+      />
+      <DataSourceActions
+        mode="reprocess"
+        :icon="true"
+        :containerID="containerID"
+        :dataSource="item"
+        @dataSourceReprocessed="refreshDataSources()"
+      />
+    </template>
+  </v-data-table>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { DataSourceT } from '@/api/types';
+import { mdiFileDocumentMultiple } from '@mdi/js';
+import DataSourceActions from './DataSourceActions.vue';
+
+interface DataSourceTableModel {
+  errorMessage: string;
+  dataSources: DataSourceT[];
+  loading: boolean;
+  search: string;
+  copy: string;
+}
+
+export default Vue.extend({
+  name: 'DataSourceTable',
+
+  components: {DataSourceActions},
+
+  props: {
+    containerID: {required: true, type: String}
+  },
+
+  data: (): DataSourceTableModel => ({
+    errorMessage: '',
+    dataSources: [],
+    loading: false,
+    search: '',
+    copy: mdiFileDocumentMultiple,
+  }),
+
+  watch: {
+    errorMessage: {handler: 'emitErrorMessage', immediate: true}
+  },
+
+  methods: {
+    emitErrorMessage() {
+      this.$emit('error', this.errorMessage);
+    },
+    headers() {
+      return [
+        { text: '', value: 'copy'},
+        { text: this.$t('general.id'), value: 'id'},
+        { text: this.$t('general.name'), value: 'name' },
+        { text: this.$t('dataSources.adapterType'), value: 'adapter_type'},
+        { text: this.$t('general.active'), value: 'active', filterable: false},
+        { text: this.$t('general.actions'), value: 'actions', sortable: false, filterable: false }
+      ]
+    },
+    refreshDataSources() {
+      this.loading = true
+      this.$client.listDataSources(this.containerID, true, false)
+          .then(dataSources => {
+            this.dataSources = dataSources
+          })
+          .catch(e => this.errorMessage = e)
+          .finally(() => this.loading = false)
+    },
+    copyID(id: string) {
+      navigator.clipboard.writeText(id);
+    },
+    toggleDataSourceActive(dataSource: DataSourceT) {
+      if(dataSource.active) {
+        this.$client.activateDataSource(this.containerID, dataSource.id!)
+          .then(()=> {
+            this.refreshDataSources();
+          })
+          .catch(e => this.errorMessage = e)
+      } else {
+        this.$client.deactivateDataSource(this.containerID, dataSource.id!)
+          .then(()=> {
+            this.refreshDataSources();
+          })
+          .catch((e: any) => this.errorMessage = e)
+      }
+    },
+  },
+
+  mounted () {
+    this.refreshDataSources();
+  }
+});
+</script>
\ No newline at end of file
diff --git a/AdminWebApp/src/components/dataSources/SelectDataSourceTypes.vue b/AdminWebApp/src/components/dataSources/SelectDataSourceTypes.vue
index 8337a4a11..02731842e 100644
--- a/AdminWebApp/src/components/dataSources/SelectDataSourceTypes.vue
+++ b/AdminWebApp/src/components/dataSources/SelectDataSourceTypes.vue
@@ -61,6 +61,9 @@
           },{
             text: this.$t('timeseries.timeseries'),
             value: "timeseries"
+          },{
+            text: this.$t('dataSources.customName'),
+            value: "custom"
           }
         ]
       },
diff --git a/AdminWebApp/src/components/dataSources/TimeseriesSourceTable.vue b/AdminWebApp/src/components/dataSources/TimeseriesSourceTable.vue
new file mode 100644
index 000000000..25978b50a
--- /dev/null
+++ b/AdminWebApp/src/components/dataSources/TimeseriesSourceTable.vue
@@ -0,0 +1,198 @@
+<template>
+  <v-data-table
+    :headers="headers()"
+    :items="dataSources"
+    class="elevation-1"
+    :search="search"
+  >
+    <template v-slot:top>
+      <v-toolbar flat color="white">
+        <v-toolbar-title>{{$t('dataSources.description')}}</v-toolbar-title>
+        <v-spacer></v-spacer>
+        <DataSourceActions
+          :icon="false"
+          mode="create"
+          :timeseries="true"
+          :containerID="containerID"
+          @dataSourceCreated="refreshTimeseriesDataSources()"
+        ></DataSourceActions>
+
+        <template v-slot:extension>
+          <v-text-field
+            v-model="search"
+            prepend-icon="mdi-magnify"
+            label="Search"
+            single-line
+            hide-details
+          ></v-text-field>
+        </template>
+
+      </v-toolbar>
+    </template>
+    <template v-slot:[`item.copy`]="{ item }">
+      <v-tooltip top>
+        <template v-slot:activator="{on, attrs}">
+          <v-icon v-bind="attrs" v-on="on" @click="copyID(item.id)">{{copy}}</v-icon>
+        </template>
+        <span>{{$t('general.copyID')}}</span>
+        <span>{{item.id}}</span>
+      </v-tooltip>
+    </template>
+    <template v-slot:[`item.name`]="{ item }">
+      <span v-if="!item.archived">{{item.name}}</span>
+      <span v-else class="text--disabled">{{item.name}}</span>
+    </template>
+    <template v-slot:[`item.adapter_type`]="{ item }">
+      <span v-if="!item.archived">{{item.adapter_type}}</span>
+      <span v-else class="text--disabled">{{item.adapter_type}}</span>
+    </template>
+    <template v-slot:[`item.fastload`]="{ item }">
+      <span>{{ item.config.fast_load_enabled }}</span>
+    </template>
+    <template v-slot:[`item.active`]="{ item }">
+      <v-switch
+        v-if="!item.archived"
+        @change="toggleDataSourceActive(item)"
+        v-model="item.active"
+        class="mt-0"
+        hide-details
+      />
+      <v-switch
+        v-else
+        :value="false"
+        class="mt-0"
+        hide-details
+        disabled
+      />
+    </template>
+    <template v-slot:[`item.actions`]="{ item }">
+      <TimeseriesViewerDialog
+        :containerID="containerID"
+        :dataSourceID="item.id"
+        :icon="true"
+        :key="key"
+        @timeseriesDialogClose="incrementKey"
+        :ref="`${item.id}viewer`"
+      ></TimeseriesViewerDialog>
+      <DataSourceActions
+        mode="edit"
+        :icon="true"
+        :containerID="containerID"
+        :dataSource="item"
+        @dataSourceUpdated="refreshTimeseriesDataSources"
+        :timeseries="true"
+      />
+      <DataSourceActions
+        mode="delete"
+        @dataSourceArchived="refreshTimeseriesDataSources()"
+        @dataSourceDeleted="refreshTimeseriesDataSources()"
+        :containerID="item.container_id"
+        :dataSource="item"
+        :timeseries="true"
+      />
+      <DataSourceActions
+        v-if="!item.archived"
+        mode="archive"
+        @dataSourceArchived="refreshTimeseriesDataSources()"
+        :containerID="item.container_id"
+        :dataSource="item"
+        :timeseries="true"
+      />
+    </template>
+  </v-data-table>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { DataSourceT } from '@/api/types';
+import { mdiFileDocumentMultiple } from '@mdi/js';
+import TimeseriesViewerDialog from '../data/TimeseriesViewerDialog.vue';
+import DataSourceActions from './DataSourceActions.vue';
+
+interface TimeseriesSourceTableModel {
+  errorMessage: string;
+  dataSources: DataSourceT[];
+  loading: boolean;
+  copy: string;
+  search: string;
+  key: number;
+}
+
+export default Vue.extend({
+  name: 'TimeseriesSourceTable',
+
+  components: {TimeseriesViewerDialog, DataSourceActions},
+
+  props: {
+    containerID: {required: true, type: String}
+  },
+
+  data: (): TimeseriesSourceTableModel => ({
+    errorMessage: '',
+    dataSources: [],
+    loading: false,
+    copy: mdiFileDocumentMultiple,
+    search: '',
+    key: 0,
+  }),
+
+  watch: {
+    errorMessage: {handler: 'emitErrorMessage', immediate: true}
+  },
+
+  methods: {
+    emitErrorMessage() {
+      this.$emit('error', this.errorMessage);
+    },
+    headers() {
+      return [
+        { text: '', value: 'copy'},
+        { text: this.$t('general.id'), value: 'id'},
+        { text: this.$t('general.name'), value: 'name' },
+        { text: this.$t('dataSources.adapterType'), value: 'adapter_type' },
+        { text: this.$t('timeseries.fastloadEnabled'), value: 'fastload', filterable: false },
+        { text: this.$t('general.active'), value: 'active', filterable: false},
+        { text: this.$t('general.actions'), value: 'actions', sortable: false, filterable: false }
+      ]
+    },
+    refreshTimeseriesDataSources() {
+      this.loading = true
+      this.$client.listDataSources(this.containerID, true, true)
+          .then(dataSources => {
+            this.dataSources= dataSources
+            this.$emit('timeseriesTab')
+          })
+          .catch(e => this.errorMessage = e)
+          .finally(() => {
+            this.loading = false
+          })
+    },
+    copyID(id: string) {
+      navigator.clipboard.writeText(id);
+    },
+    incrementKey() {
+      this.key += 1;
+      this.$router.replace(`/containers/${this.containerID}/data-sources`)
+    },
+    toggleDataSourceActive(dataSource: DataSourceT) {
+      if(dataSource.active) {
+        this.$client.activateDataSource(this.containerID, dataSource.id!)
+          .then(()=> {
+            this.refreshTimeseriesDataSources();
+          })
+          .catch(e => this.errorMessage = e)
+      } else {
+        this.$client.deactivateDataSource(this.containerID, dataSource.id!)
+          .then(()=> {
+            this.refreshTimeseriesDataSources();
+          })
+          .catch((e: any) => this.errorMessage = e)
+      }
+    },
+  },
+
+  mounted() {
+    this.refreshTimeseriesDataSources();
+  }
+})
+</script>
\ No newline at end of file
diff --git a/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateActions.vue b/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateActions.vue
new file mode 100644
index 000000000..9ae602eb9
--- /dev/null
+++ b/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateActions.vue
@@ -0,0 +1,256 @@
+<template>
+  <DialogBasic
+    ref="dialog"
+    :icon-name="config.icon"
+    :max-width="maxWidth"
+    :icon="icon"
+    :title="config.title"
+    @openDialog="openDialog"
+  >
+    <template #content>
+      <error-banner :message="errorMessage" @closeAlert="errorMessage = ''"/>
+
+      <template v-if="mode === 'create' || mode === 'edit'">
+        <DataSourceTemplateCard
+          :mode="mode"
+          type="container"
+          :template="toSave"
+          :key="refreshKey"
+          @validationUpdated="setTemplateValidation"
+        />
+      </template>
+
+      <template v-if="mode === 'delete'">
+        <v-row>
+          <v-col :cols="12">
+            <v-alert type="error">
+              {{ $t('warnings.deleteTemplate') }}
+            </v-alert>
+          </v-col>
+        </v-row>
+      </template>
+
+      <template v-if="mode === 'authorize'">
+        <v-row>
+          <v-col :cols="12">
+            <v-alert type="warning">
+              {{$t('dataSourceTemplates.authorizeDescription')}}
+            </v-alert>
+          </v-col>
+        </v-row>
+      </template>
+
+      <template v-if="mode === 'import'">
+        <div>{{ $t('help.importTemplates') }}</div>
+        <!-- Using v-cols to make sure the drop downs don't interfere with button clickability -->
+        <v-row>
+          <v-col :cols="10">
+            <ContainerSelect 
+              @containerSelected="setContainer"
+              :exclude="true"
+              :excludedID="containerID"
+              :key="refreshKey"
+            />
+          </v-col>
+        </v-row>
+        <v-row>
+          <v-col :cols="10">
+            <SelectDataSourceTemplate v-if="selectedContainer"
+              :containerID="selectedContainer.id"
+              :noIndent="true"
+              :multiple="true"
+              @selected="setTemplates"
+              :key="selectedContainer.id"
+            />
+          </v-col>
+        </v-row>
+      </template>
+    </template>
+
+    <template #actions>
+      <template v-if="mode === 'create'">
+        <v-progress-circular indeterminate v-if="loading"/>
+        <v-btn v-if="!loading"
+          color="primary" 
+          :disabled="isDisabled" 
+          text 
+          @click="saveTemplates('created')"
+        >{{ $t('general.create') }}</v-btn>
+      </template>
+
+      <template v-if="mode === 'edit'">
+        <v-progress-circular indeterminate v-if="loading"/>
+        <v-btn v-if="!loading"
+          color="primary" 
+          text 
+          @click="saveTemplates('updated')"
+        >{{ $t('general.save') }}</v-btn>
+      </template>
+
+      <template v-if="mode === 'delete'">
+        <v-progress-circular indeterminate v-if="loading"/>
+        <v-btn v-if="!loading"
+          color="error" 
+          text 
+          @click="deleteTemplate()"
+        >{{ $t('general.delete') }}</v-btn>
+      </template>
+
+      <template v-if="mode === 'authorize'">
+        <v-btn
+          color="primary" 
+          text 
+          @click="authorizeTemplate()"
+        >{{ $t('general.authorize') }}</v-btn>
+      </template>
+
+      <template v-if="mode === 'import'">
+        <v-progress-circular indeterminate v-if="loading"/>
+        <v-btn v-if="!loading"
+          color="primary" 
+          text 
+          @click="saveTemplates('imported')"
+        >{{ $t('imports.import') }}</v-btn>
+      </template>
+    </template>
+  </DialogBasic>
+</template>
+
+<script lang="ts">
+import Vue, {PropType} from 'vue';
+import DialogBasic from '../../dialogs/DialogBasic.vue';
+import DataSourceTemplateCard from './DataSourceTemplateCard.vue';
+import { DataSourceTemplateT, DefaultDataSourceTemplate, ContainerT } from '@/api/types';
+import SelectDataSourceTemplate from './SelectDataSourceTemplate.vue';
+import ContainerSelect from '@/components/ontology/containers/ContainerSelect.vue';
+
+interface DataSourceTemplateActionsModel {
+  errorMessage: string;
+  disabled: boolean;
+  config: {icon?: string, title?: string};
+  toSave: DataSourceTemplateT;
+  selectedContainer: ContainerT | null;
+  toImport: DataSourceTemplateT[];
+  refreshKey: number;
+  loading: boolean;
+}
+
+export default Vue.extend({
+  name: 'DataSourceTemplateActions',
+
+  components: { DialogBasic, DataSourceTemplateCard, SelectDataSourceTemplate, ContainerSelect },
+
+  data: (): DataSourceTemplateActionsModel => ({
+    errorMessage: '',
+    disabled: true,
+    config: {},
+    toSave: DefaultDataSourceTemplate(),
+    selectedContainer: null,
+    toImport: [],
+    refreshKey: 0,
+    loading: false,
+  }),
+
+  props: {
+    mode: {type: String, required: true},
+    icon: {type: Boolean, required: false, default: true},
+    containerID: {type: String, required: true},
+    template: {type: Object as PropType<DataSourceTemplateT>, required: false},
+    maxWidth: {type: String, required: false, default: '80%'}
+  },
+
+  computed: {
+    isDisabled(): boolean {
+      return this.disabled;
+    },
+  },
+
+  methods: {
+    setTemplateValidation(validTemplate: boolean) {
+      this.disabled = !validTemplate;
+    },
+    setContainer(container: ContainerT) {
+      this.selectedContainer = container;
+    },
+    setTemplates(t: DataSourceTemplateT | DataSourceTemplateT[]) {
+      if (!Array.isArray(t)) t = [t];
+      this.toImport = t;
+    },
+    // DIALOG MANAGEMENT
+    openDialog() {
+      this.$nextTick(() => {this.resetDialog()});
+    },
+    closeDialog(emitMessage?: string) {
+      if (emitMessage) this.$emit(emitMessage);
+      const dialogInstance = this.$refs.dialog as InstanceType<typeof DialogBasic> | undefined;
+        if (dialogInstance) dialogInstance.close();
+    },
+    resetDialog() {
+      this.errorMessage = '';
+      this.disabled = true;
+      if (this.mode === 'create') {
+        this.toSave = DefaultDataSourceTemplate();
+      } else if (this.mode === 'edit') {
+        this.toSave = Object.assign({}, this.template);
+      }
+      // force template card to reload on reset
+      this.refreshKey += 1;
+      this.selectedContainer = null;
+    },
+    // BUTTON FUNCTIONS
+    // this function is used for create, edit, and import buttons
+    saveTemplates(mode: string) {
+      const templates = mode === 'imported' ? this.toImport : [this.toSave];
+      this.$client.saveDataSourceTemplates(this.containerID, templates)
+        .then(() => {
+          this.closeDialog(mode);
+        })
+        .catch(e => this.errorMessage = e);
+    },
+    authorizeTemplate() {
+      window.open(`${this.template.redirect_address}/redirect/${this.containerID}`, "_blank");
+      this.$emit('authorized');
+      this.closeDialog();
+    },
+    deleteTemplate() {
+      this.$client.deleteDataSourceTemplate(this.containerID, this.template.id!)
+        .then(() => {
+          this.closeDialog('deleted');
+        })
+        .catch(e => this.errorMessage = e);
+    }
+  },
+
+  beforeMount() {
+    switch(this.mode) {
+      case 'create': {
+        this.config.title = this.$t('dataSourceTemplates.create') as string;
+        break;
+      }
+      case 'import': {
+        this.config.title = this.$t('dataSourceTemplates.import') as string;
+        break;
+      }
+      case 'edit': {
+        this.config.title = this.$t('dataSourceTemplates.edit') as string;
+        this.config.icon = 'mdi-pencil';
+        break;
+      }
+      case 'authorize': {
+        this.config.title = this.$t('dataSourceTemplates.authorize') as string;
+        this.config.icon = 'mdi-lock-open';
+        break;
+      }
+      case 'delete': {
+        this.config.title = this.$t('dataSourceTemplates.delete') as string;
+        this.config.icon = 'mdi-delete';
+        break;
+      }
+    }
+
+    if (this.mode === 'edit') {
+      this.toSave = this.template;
+    }
+  }
+});
+</script>
\ No newline at end of file
diff --git a/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateCard.vue b/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateCard.vue
new file mode 100644
index 000000000..f031ba434
--- /dev/null
+++ b/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateCard.vue
@@ -0,0 +1,233 @@
+<template>
+  <v-card class="pt-1 pb-3 px-2">
+    <error-banner :message="errorMessage" @closeAlert="errorMessage = ''"/>
+    <template v-if="mode === 'create' && type === 'container'">
+      <h3>{{$t('dataSourceTemplates.new')}}</h3>
+      <span>{{$t('dataSourceTemplates.description')}}</span>
+    </template>
+
+    <template v-if="mode === 'edit' && type === 'container'">
+      <v-row>
+        <v-col :cols="12">
+          <v-alert type="warning">
+            {{ $t('dataSourceTemplates.editNote') }}
+          </v-alert>
+        </v-col>
+      </v-row>
+    </template>
+
+    <v-form
+      ref="form"
+      lazy-validation
+      v-model="templateValid"
+    >
+      <v-row>
+        <v-col :cols="12">
+          <v-text-field
+            :label="$t('dataSourceTemplates.name')"
+            v-model="newTemplate.name"
+            :rules="[validateRequired]"
+          />
+        </v-col>
+      </v-row>
+
+      <v-row>
+        <v-col :cols="12">
+          <v-text-field
+            :label="$t('dataSourceTemplates.redirect')"
+            v-model="newTemplate.redirect_address"
+            :rules="[validateRequired]"
+          >
+            <template slot="append-outer">
+              <info-tooltip :message="$t('help.templateRedirect')"></info-tooltip>
+            </template>
+          </v-text-field>
+        </v-col>
+      </v-row>
+
+      <h4>{{ $t('dataSourceTemplates.customFields') }}
+        <info-tooltip :message="$t('help.customTemplateFields')"></info-tooltip>
+      </h4>
+      <v-data-table
+        :headers="customFieldHeaders"
+        :items="customFields"
+        :items-per-page="-1"
+        mobile-breakpoint="960"
+        item-key="id"
+        flat
+        tile
+        fixed-header
+        disable-pagination
+        disable-sort
+        hide-default-footer
+      >
+        <template v-slot:[`item.name`]="{item}">
+          <v-text-field
+            :label="$t('general.name')"
+            v-model="item.name"
+            :rules="[validateRequired]"
+          />
+        </template>
+
+        <template v-slot:[`item.value`]="{item}">
+          <v-text-field
+            :label="editLabel"
+            v-model="item.value"
+            :rules="[validateRequired(item.value, item.required)]"
+          />
+        </template>
+
+        <template v-slot:[`item.required`]="{item}">
+          <v-simple-checkbox
+            v-model="item.required"
+            :disabled="disableRequired(item)"
+          />
+        </template>
+
+        <template v-slot:[`item.encrypt`]="{item, index}">
+          <v-simple-checkbox
+            v-model="item.encrypt"
+            @click="updateRequired(item.encrypt, index)"
+          />
+        </template>
+
+        <template v-slot:[`item.actions`]="{index}">
+          <v-icon @click="removeCustomField(index)">mdi-close</v-icon>
+        </template>
+      </v-data-table>
+    </v-form>
+
+    <v-row>
+      <v-col :cols="12" style="padding:25px" align="center" justify="center">
+        <v-btn @click="addCustomField">{{ $t('general.addField') }}</v-btn>
+      </v-col>
+    </v-row>
+
+    <!-- Give users the option of saving their template to the container from the data source -->
+    <v-checkbox v-if="saveOption"
+      :label="$t('dataSourceTemplates.save')"
+      v-model="saveToContainer"
+    />
+  </v-card>
+</template>
+
+<script lang="ts">
+import { CustomTemplateFieldT, DataSourceTemplateT } from '@/api/types';
+import Vue, { PropType } from 'vue';
+
+interface DataSourceTemplateCardModel {
+  errorMessage: string;
+  newTemplate: DataSourceTemplateT;
+  customFields: CustomTemplateFieldT[];
+  saveToContainer: boolean;
+  templateValid: boolean;
+}
+
+interface VForm extends Vue {
+  validate: () => boolean;
+}
+
+export default Vue.extend({
+  name: 'DataSourceTemplateCard',
+
+  props: {
+    mode: {type: String, required: true},
+    type: {type: String, required: true},
+    template: {type: Object as PropType<DataSourceTemplateT>, required: true},
+    saveOption: {type: Boolean, required: false, default: false}
+  },
+
+  data: (): DataSourceTemplateCardModel => ({
+    errorMessage: '',
+    newTemplate: {
+      name: 'New Template',
+      custom_fields: [],
+      redirect_address: '',
+    },
+    customFields: [],
+    saveToContainer: false,
+    templateValid: false
+  }),
+
+  computed: {
+    customFieldHeaders(): {text: string, value: string, sortable?: boolean}[] {
+      return [
+        {text: this.$t('general.name'), value: 'name'},
+        {text: this.$t('general.value'), value: 'value'},
+        {text: this.$t('dataSourceTemplates.requireField'), value: 'required'},
+        {text: this.$t('dataSourceTemplates.encryptField'), value: 'encrypt'},
+        {text: this.$t('general.actions'), value: 'actions', sortable: false},
+      ];
+    },
+    editLabel(): string {
+      let label = this.$t('general.value');
+      if (this.mode === 'edit' && this.type === 'dataSource') {
+        label = `${this.$t('general.value')} ${this.$t('help.removedForSecurity')}`
+      }
+      return label;
+    }
+  },
+
+  watch: {
+    templateValid: {handler: 'emitValidation', immediate: true}
+  },
+
+  methods: {
+    disableRequired(item: CustomTemplateFieldT): boolean {
+      return item.encrypt ?? false;
+    },
+    addCustomField() {
+      this.customFields.push({
+        name: '',
+        value: '',
+        required: false,
+        encrypt: false
+      });
+      this.$nextTick(() => {
+        this.validateForm();
+      });
+    },
+    removeCustomField(index: number) {
+      this.customFields.splice(index, 1);
+      this.$nextTick(() => {
+        this.validateForm();
+      });
+    },
+    validateRequired(value: string, required?: boolean) {
+      if (required === undefined || required === true) {
+        if (!value) {
+          return this.$t('validation.required');
+        }
+      }
+      return true;
+    },
+    updateRequired(encrypt: boolean, index: number) {
+      if (encrypt) {
+        this.customFields[index].required = encrypt;
+      }
+    },
+    validateForm() {
+      if (this.$refs.form && (this.$refs.form as VForm).validate) {
+        (this.$refs.form as VForm).validate();
+      }
+    },
+    emitValidation() {
+      this.validateForm();
+      this.$emit('validationUpdated', this.templateValid);
+    }
+  },
+
+  beforeMount() {
+    if (this.template && (this.saveOption !== true)) {
+      this.newTemplate = this.template;
+      this.customFields = this.template.custom_fields ?? [];
+    } else {
+      this.newTemplate = {
+        name: '',
+        custom_fields: [],
+        redirect_address: '',
+      }
+    }
+  }
+})
+</script>
\ No newline at end of file
diff --git a/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateTable.vue b/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateTable.vue
new file mode 100644
index 000000000..fcd1ab32e
--- /dev/null
+++ b/AdminWebApp/src/components/dataSources/dataSourceTemplates/DataSourceTemplateTable.vue
@@ -0,0 +1,125 @@
+<template>
+  <v-data-table
+    :headers="headers()"
+    :items="templates"
+    :loading="loading"
+    class="elevation-1"
+    :search="search"
+  >
+    <template v-slot:top>
+      <v-toolbar flat color="white">
+        <v-toolbar-title>{{ $t('dataSourceTemplates.configure') }}</v-toolbar-title>
+        <v-spacer></v-spacer>
+        <DataSourceTemplateActions
+          :icon="false"
+          mode="import"
+          :containerID="containerID"
+          @imported="refreshTemplates()"
+        />
+        <div style="margin-left: 15px;">
+          <DataSourceTemplateActions
+            :icon="false"
+            mode="create"
+            :containerID="containerID"
+            @created="refreshTemplates()"
+          />
+        </div>
+      </v-toolbar>
+    </template>
+
+    <template v-slot:[`item.name`]="{item}">
+      <span>{{ item.name }}</span>
+    </template>
+
+    <template v-slot:[`item.redirect`]="{item}">
+      <span>{{ item.redirect_address }}</span>
+    </template>
+
+    <template v-slot:[`item.actions`]="{item}">
+      <div v-if="item">
+        <DataSourceTemplateActions
+          mode="edit"
+          :icon="true"
+          :containerID="containerID"
+          :template="item"
+          @updated="refreshTemplates()"
+        />
+        <DataSourceTemplateActions
+          mode="authorize"
+          :icon="true"
+          :containerID="containerID"
+          :template="item"
+          @authorized="refreshTemplates()"
+        />
+        <DataSourceTemplateActions
+          mode="delete"
+          :icon="true"
+          :containerID="containerID"
+          :template="item"
+          @deleted="refreshTemplates()"
+        />
+      </div>
+    </template>
+  </v-data-table>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { DataSourceTemplateT } from '@/api/types';
+import DataSourceTemplateActions from './DataSourceTemplateActions.vue';
+
+interface DataSourceTemplateTableModel {
+  errorMessage: string;
+  loading: boolean;
+  templates: DataSourceTemplateT[];
+  search: string;
+}
+
+export default Vue.extend({
+  name: 'DataSourceTemplateTable',
+
+  components: {DataSourceTemplateActions},
+
+  props: {
+    containerID: {required: true, type: String},
+  },
+
+  data: (): DataSourceTemplateTableModel => ({
+    errorMessage: '',
+    loading: false,
+    templates: [],
+    search: ''
+  }),
+
+  watch: {
+    errorMessage: {handler: 'emitErrorMessage', immediate: true}
+  },
+
+  methods: {
+    headers() {
+      return [
+        { text: '', value: 'copy'},
+        { text: this.$t('dataSourceTemplates.name'), value: 'name' },
+        { text: this.$t('dataSourceTemplates.redirect'), value: 'redirect'},
+        { text: this.$t('general.actions'), value: 'actions', sortable: false, filterable: false }
+      ]
+    },
+    emitErrorMessage() {
+      this.$emit('error', this.errorMessage);
+    },
+    refreshTemplates() {
+      this.loading = true
+      this.$client.listDataSourceTemplates(this.containerID)
+        .then(templates => {
+          this.templates = templates;
+        })
+        .catch(e => this.errorMessage = e)
+        .finally(() => this.loading = false)
+    }
+  },
+
+  mounted() {
+    this.refreshTemplates();
+  }
+})
+</script>
\ No newline at end of file
diff --git a/AdminWebApp/src/components/dataSources/dataSourceTemplates/SelectDataSourceTemplate.vue b/AdminWebApp/src/components/dataSources/dataSourceTemplates/SelectDataSourceTemplate.vue
new file mode 100644
index 000000000..ec3593a69
--- /dev/null
+++ b/AdminWebApp/src/components/dataSources/dataSourceTemplates/SelectDataSourceTemplate.vue
@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <error-banner :message="errorMessage" @closeAlert="errorMessage = ''"/>
+    <v-combobox
+      :style="[noIndent ? '' : 'margin-left:10px; margin-right:10px']"
+      :items="templates"
+      item-text="name"
+      @change="setTemplate"
+      :label="multiple ? `${$t('dataSourceTemplates.select')}s` : $t('dataSourceTemplates.select')"
+      :multiple="multiple"
+      :clearable="multiple"
+      v-model="selected"
+      :loading="loading"
+      :key="key"
+    />
+  </div>
+</template>
+
+<script lang="ts">
+  import Vue from 'vue';
+  import {DataSourceTemplateT} from "@/api/types";
+  import {v4 as uuidv4} from 'uuid';
+  
+  interface SelectDataSourceTemplateModel {
+    templates: DataSourceTemplateT[];
+    selected: DataSourceTemplateT | DataSourceTemplateT[] | null;
+    errorMessage: string;
+    loading: boolean;
+    key: number;
+  }
+
+  const newTemplate: DataSourceTemplateT = {
+    id: uuidv4(),
+    name: 'New Template',
+    custom_fields: [],
+    redirect_address: '',
+    saveable: true
+  }
+
+  export default Vue.extend({
+    name: 'SelectDataSourceTemplate',
+
+    props: {
+      containerID: {type: String, required: true},
+      multiple: {type: Boolean, required: false, default: false},
+      clear: {type: Boolean, required: false, default: false},
+      noIndent: {type: Boolean, required: false, default: false},
+      includeBlank: {type: Boolean, required: false, default: false},
+    },
+
+    data: (): SelectDataSourceTemplateModel => ({
+      templates: [],
+      selected: null,
+      errorMessage: '',
+      loading: false,
+      key: 0,
+    }),
+
+    watch: {
+      clear: {handler: 'incrementKey', immediate: true}
+    },
+
+    methods: {
+      setTemplate(template: DataSourceTemplateT | DataSourceTemplateT[]) {
+        this.$emit('selected', template);
+      },
+      incrementKey() {
+        this.key += 1;
+      }
+    },
+
+    mounted() {
+      this.$client.listDataSourceTemplates(this.containerID)
+        .then(templates => {
+          // add a new template if specified
+          this.templates = this.includeBlank ? templates.concat(newTemplate) : templates;
+        })
+        .catch(e => this.errorMessage = e)
+    }
+  })
+
+  
+</script>
\ No newline at end of file
diff --git a/AdminWebApp/src/components/etl/TransformationDialog.vue b/AdminWebApp/src/components/etl/TransformationDialog.vue
index ac4397d14..16184b324 100644
--- a/AdminWebApp/src/components/etl/TransformationDialog.vue
+++ b/AdminWebApp/src/components/etl/TransformationDialog.vue
@@ -152,6 +152,7 @@
                               v-if="rootArray"
                               :items="payloadKeys"
                               v-model="uniqueIdentifierKey"
+                              :rules="[validateIDRequired]"
                               clearable
                           >
                             <template v-slot:label>{{ $t('transformations.uniqueID') }}</template>
@@ -209,6 +210,18 @@
                           </v-autocomplete>
                         </v-col>
 
+                        <!-- merge flag -->
+                        <v-col cols="12" md="6" lg="4">
+                          <v-checkbox
+                              v-model="merge"
+                          >
+                            <template v-slot:label>{{$t('general.merge')}}</template>
+                            <template slot="prepend">
+                              <info-tooltip :message="$t('help.mergeHelp')"/>
+                            </template>
+                          </v-checkbox>
+                        </v-col>
+
                         <v-col cols="12" md="6" lg="4" v-if="keysLoading">
                           <v-progress-linear
                               indeterminate
@@ -337,7 +350,7 @@
                                       :rules="[validateRequired]"
                                       required
                                     >
-                                      <template v-slot:label>{{ $t('transformations.childID') }} 
+                                      <template v-slot:label>{{ $t('transformations.childID') }}
                                         <small style="color:red">{{ $t('validation.required') }}</small>
                                       </template>
                                       <template slot="append-outer">
@@ -445,7 +458,7 @@
 
                                       <v-col :cols="12" v-else-if="item.type === 'data_source'">
                                         <SelectDataSource
-                                          @selected="setFilterMetatypeID(item, $event)"
+                                          @selected="setFilterDataSourceID(item, $event)"
                                           :dataSourceID="item.value"
                                           :containerID="containerID"
                                         />
@@ -566,7 +579,7 @@
 
                                       <v-col :cols="12" v-else-if="item.type === 'data_source'">
                                         <SelectDataSource
-                                          @selected="setFilterMetatypeID(item, $event)"
+                                          @selected="setFilterDataSourceID(item, $event)"
                                           :dataSourceID="item.value"
                                           :containerID="containerID"
                                         />
@@ -691,7 +704,7 @@
                                   :value="propertyKey(key)"
                               >
                                 <template v-slot:append-outer>{{ $t("general.or") }}</template>
-                                <template v-slot:label>{{ $t('transformations.typeSelectKey') }} 
+                                <template v-slot:label>{{ $t('transformations.typeSelectKey') }}
                                   <small style="color:red" v-if="key.required">{{ $t('validation.required') }}</small>
                                 </template>
                                 <template v-slot:item="data">
@@ -1153,15 +1166,16 @@ interface TransformationDialogModel {
   propertyMapping: {[key: string]: any}[];
   tags: TagT[];
   selectedTags: TagT[];
+  merge: boolean;
 }
 
 export default Vue.extend ({
   name: 'TransformationDialog',
 
-  components: { 
-    SelectDataSource, 
+  components: {
+    SelectDataSource,
     SearchMetatypes,
-    MetatypeKeysSelect 
+    MetatypeKeysSelect
   },
 
   props: {
@@ -1171,7 +1185,7 @@ export default Vue.extend ({
     typeMappingID: {type: String, required: true},
     transformation: {
       type: Object as PropType<TypeMappingTransformationT | null>,
-      required: false, 
+      required: false,
       default: null
     },
     icon: {type: Boolean, required: false},
@@ -1206,6 +1220,7 @@ export default Vue.extend ({
         {text: this.$t('operators.lte'), value: "<=", requiresValue: true},
         {text: this.$t('operators.greaterThan'), value: ">", requiresValue: true},
         {text: this.$t('operators.gte'), value: ">=", requiresValue: true},
+        {text: this.$t('operators.in'), value: "in", requiresValue: true},
       ];
     },
     configFilterTypes() {
@@ -1221,15 +1236,15 @@ export default Vue.extend ({
     },
     conditionsHeader() {
       return [
-        {text: this.$t('general.key'), value: "key"}, 
-        {text: this.$t('operators.operator'), value: "operator"}, 
+        {text: this.$t('general.key'), value: "key"},
+        {text: this.$t('operators.operator'), value: "operator"},
         {text: this.$t('general.value'), value: "value"},
         {text: this.$t('general.actions'), value: "actions", sortable: false}
       ];
     },
     subexpressionHeader() {
       return [
-        {text: this.$t('transformations.expression'), value: "expression"}, 
+        {text: this.$t('transformations.expression'), value: "expression"},
         {text: this.$t('general.key'), value: "key"},
         {text: this.$t('operators.operator'), value: "operator"},
         {text: this.$t('general.value'), value: "value"},
@@ -1256,7 +1271,7 @@ export default Vue.extend ({
     },
     payloadTypes() {
       return [
-        {name: this.$t("nodes.node"), value: 'node'}, 
+        {name: this.$t("nodes.node"), value: 'node'},
         {name: this.$t("edges.edge"), value: 'edge'}
       ];
     },
@@ -1347,7 +1362,8 @@ export default Vue.extend ({
     uniqueIdentifierKey: null,
     propertyMapping: [],
     tags: [],
-    selectedTags: []
+    selectedTags: [],
+    merge: false,
   }),
 
   watch: {
@@ -1384,6 +1400,11 @@ export default Vue.extend ({
     validatePostgresDate(value: string) {
       return !value.includes('%') || this.$t('help.postgresDate');
     },
+    validateIDRequired(value: any) {
+      // original data id is required for merging node data from a transformation
+      if (this.merge) return !!value || this.$t('validation.required')
+      return true;
+    },
     reset() {
       const mainForm: any = this.$refs.mainForm
       const conditionForm: any = this.$refs.conditionForm
@@ -1428,7 +1449,7 @@ export default Vue.extend ({
           //identical function for all tranformations no matter when they were created.
           this.$client.retrieveMetatypeRelationshipPair(this.containerID, this.transformation?.metatype_relationship_pair_id!)
             .then((pair) => {
-              this.selectedRelationshipPair = pair    
+              this.selectedRelationshipPair = pair
             })
             .catch(e => this.errorMessage = e)
         }
@@ -1461,7 +1482,11 @@ export default Vue.extend ({
         this.selectedTags = this.transformation.tags;
       }
 
-      this.name = this.transformation?.name!
+      if (this.transformation?.merge) {
+        this.merge = this.transformation?.merge
+      }
+
+      this.name = this.transformation?.name!;
       this.onConversionError = this.transformation?.config.on_conversion_error as TransformationErrorAction;
       this.onKeyExtractionError = this.transformation?.config.on_key_extraction_error as TransformationErrorAction;
     },
@@ -1720,6 +1745,7 @@ export default Vue.extend ({
 
       if (this.selectedTags.length > 0) payload.tags = this.selectedTags
 
+      payload.merge = this.merge
       payload.config.on_conversion_error = this.onConversionError
       payload.config.on_key_extraction_error = this.onKeyExtractionError
       payload.conditions = this.conditions
@@ -1766,6 +1792,7 @@ export default Vue.extend ({
       payload.conditions = this.conditions
       payload.keys = this.propertyMapping
       payload.type_mapping_id = this.typeMappingID
+      payload.merge = this.merge
       if (this.uniqueIdentifierKey) payload.unique_identifier_key = this.uniqueIdentifierKey
       if (this.rootArray) payload.root_array = this.rootArray
 
@@ -2107,6 +2134,9 @@ export default Vue.extend ({
     setFilterMetatypeID(item: EdgeConfigKeyT, metatype: MetatypeT): void {
       item.value = metatype.id;
     },
+    setFilterDataSourceID(item: EdgeConfigKeyT, dataSource: DataSourceT): void {
+      item.value = dataSource.id;
+    },
     setFilterPropertyKey(item: EdgeConfigKeyT, key: MetatypeKeyT): void {
       item.property = key.property_name
     },
@@ -2184,7 +2214,7 @@ export default Vue.extend ({
         this.relationshipPairs = pairs as MetatypeRelationshipPairT[]
       })
       .catch(e => this.errorMessage = e)
-        
+
     if (this.transformation) {
       if (this.transformation.origin_parameters) this.originConfigKeys = JSON.parse(JSON.stringify(this.transformation.origin_parameters));
       if (this.transformation.destination_parameters) this.destinationConfigKeys = JSON.parse(JSON.stringify(this.transformation.destination_parameters));
diff --git a/AdminWebApp/src/components/ontology/containers/ContainerSelect.vue b/AdminWebApp/src/components/ontology/containers/ContainerSelect.vue
index 967979545..e3ccd24e9 100644
--- a/AdminWebApp/src/components/ontology/containers/ContainerSelect.vue
+++ b/AdminWebApp/src/components/ontology/containers/ContainerSelect.vue
@@ -28,6 +28,11 @@
       errorMessage: ""
     }),
 
+    props: {
+      exclude: {type: Boolean, required: false, default: false},
+      excludedID: {type: String, required: false}
+    },
+
     methods: {
       setActiveContainer(container: any) {
         this.$store.commit('setActiveContainer', container)
@@ -38,7 +43,12 @@
     mounted() {
       this.$client.listContainers()
         .then(containers => {
-            this.containers = containers
+            // there may be occaisions where you don't want the current container as a dropdown option
+            if (this.exclude && this.excludedID) {
+              this.containers = containers.filter(c => c.id !== this.excludedID);
+            } else {
+              this.containers = containers;
+            }
         })
         .catch(e => this.errorMessage = e)
     }
diff --git a/AdminWebApp/src/components/ontology/containers/CreateContainerDialog.vue b/AdminWebApp/src/components/ontology/containers/CreateContainerDialog.vue
index e4cb42c41..15d7c43cc 100644
--- a/AdminWebApp/src/components/ontology/containers/CreateContainerDialog.vue
+++ b/AdminWebApp/src/components/ontology/containers/CreateContainerDialog.vue
@@ -79,7 +79,7 @@
 </template>
 
 <script lang="ts">
-  import Vue, { PropType } from 'vue'
+  import Vue from 'vue'
   import SelectDataSourceTypes from "@/components/dataSources/SelectDataSourceTypes.vue";
 
   interface CreateContainerDialogModel {
diff --git a/AdminWebApp/src/components/ontology/metatypeRelationshipPairs/CreateRelationshipPairDialog.vue b/AdminWebApp/src/components/ontology/metatypeRelationshipPairs/CreateRelationshipPairDialog.vue
index 42fe9bb1b..6617931e1 100644
--- a/AdminWebApp/src/components/ontology/metatypeRelationshipPairs/CreateRelationshipPairDialog.vue
+++ b/AdminWebApp/src/components/ontology/metatypeRelationshipPairs/CreateRelationshipPairDialog.vue
@@ -23,20 +23,12 @@
                 ref="form"
                 v-model="valid"
             >
-              <v-autocomplete
-                  v-model="originSelect"
-                  :rules="[validationRule]"
-                  :single-line="false"
-                  :items="originMetatypes"
-                  :search-input.sync="originSearch"
-                  item-text="name"
-                  return-object
-                  persistent-hint
+              <v-text-field
+                  :label="$t('edges.originClass')"
+                  :value="metatype.name"
                   required
                   disabled
-              >
-                <template v-slot:label>{{$t('edges.originClass')}} <small style="color:red" >*</small></template>
-              </v-autocomplete>
+              />
               <v-autocomplete
                   v-model="relationshipSelect"
                   :rules="[validationRule]"
@@ -92,7 +84,6 @@
 
   interface CreateRelationshipPairDialogModel {
     errorMessage: string | {message: string, format: string}[]
-    originSelect: MetatypeT | undefined
     originMetatypes: MetatypeT[]
     destinationMetatypes: MetatypeT[]
     metatypeRelationships: MetatypeRelationshipT[]
@@ -130,7 +121,6 @@
 
     data: (): CreateRelationshipPairDialogModel => ({
       errorMessage: "",
-      originSelect: undefined,
       originMetatypes: [],
       destinationMetatypes: [],
       metatypeRelationships: [],
@@ -148,12 +138,6 @@
       pairLoading: false
     }),
 
-    created() {
-      if (this.metatype) {
-        this.originSelect = this.metatype
-      }
-    },
-
     watch: {
       dialog: {
         immediate: true,
@@ -212,7 +196,7 @@
       newRelationshipPair() {
         this.pairLoading = true
         this.$client.createMetatypeRelationshipPair(this.containerID,
-            {"origin_metatype_id": this.originSelect!.id,
+            {"origin_metatype_id": this.metatype!.id,
               "destination_metatype_id": this.destinationSelect,
               "relationship_id": this.relationshipSelect,
               "ontology_version": this.$store.getters.activeOntologyVersionID,
@@ -237,7 +221,6 @@
       reset() {
         this.name =  ""
         this.description = ""
-        this.originSelect = undefined
         this.destinationSelect = ""
         this.relationshipSelect = ""
         this.relationshipType = ""
diff --git a/AdminWebApp/src/translations.ts b/AdminWebApp/src/translations.ts
index f9ccdae17..07bc85fe3 100644
--- a/AdminWebApp/src/translations.ts
+++ b/AdminWebApp/src/translations.ts
@@ -17,6 +17,7 @@ export default {
             columnNameRegex:
                 'Column Names must start with a lowercase letter or underscore and contain only lowercase letters, numbers and underscores. Spaces are not allowed and it must be between 2 and 30 characters in length.',
             conditions: 'Your transformation will only be applied to the data when these conditions are met.',
+            customTemplateFields: 'Use this section to specify any additional information your adapter may need from the user in order to function properly- things like userame and password, or project ID. More information can be found on the wiki.',
             tellUs: 'Tell Us!',
             dataRetention:
                 'This controls how many days DeepLynx will retain the raw data you import. A value of 0 will retain no raw data after processing and a value of -1 will retain raw data indefinitely.',
@@ -57,6 +58,8 @@ export default {
             help: 'Need Help? Learn more on our ',
             importDataSource: 'Imports new or updated data sources from the supplied container file.',
             importOntology: 'Imports a new ontology from the supplied container file.',
+            importTemplates: 
+                'Choose existing data source templates to import from another container. Note that any templates of the same name which exist in this container will be overwritten.',
             importTypeMapping: 'Imports new or updated type mappings from the supplied container file.',
             mapKey: 'Key on original payload to which the operator will be applied',
             mapping:
@@ -100,6 +103,8 @@ export default {
             strftimeDate: 'Date String should be in strftime datetime format',
             subexpressions:
                 'Subexpressions allow for more complicated conditions to be created by enabling the use of AND/OR expressions when applying conditions.',
+            templateRedirect:
+                'This field indicates the web address where your adapter is deployed. DeepLynx will attempt to reach the ${address}/redirect/${containerID} endpoint in order to authenticate your adapter.',
             timeseriesTableDesign: 'You must design a database table in which to store this timeseries data. More information can be found on our wiki.',
             transformationConfig: 'Transformation configuration options, generally how to deal with errors on key mapping and conversion.',
             typeMapping:
@@ -114,6 +119,8 @@ export default {
             createdAtManual: 'Select "Default" to use the import time as the "created at" value, or set the time manually',
             removedForSecurity: '(Removed for Security)',
             tagMapping: 'Nodes or edges may be associated with tags. Tags connect graph data with 2D/3D models.',
+            mergeHelp:
+                'Select this option to merge incoming properties and supplementary data with existing data on updates, otherwise data will be overwritten',
         },
         links: {
             timeseriesQuickStart: 'https://github.com/idaholab/Deep-Lynx/wiki/Timeseries-Quick-Start-Guide',
@@ -199,17 +206,16 @@ export default {
                 'Deleting this key will cause any integration which uses it to no longer be able to authenticate with DeepLynx. Only delete a key that you know is not in use or has been compromised. Deleting a key/pair cannot be undone.',
             deleteEvent:
                 'Deleting an Event Action means it will be unrecoverable to even administrative users. Only delete Event Actions you know are no longer needed or that were created in error.',
-            deleteProperty: 
-                'Are you sure you want to delete this property? It can be viewed later by clicking through the history seciton.',
-            deleteEdge:
-                'Deleting an edge will remove it from the graph. Are you sure you want to delete this edge?',
-            deleteNode: 
-                'Deleting a node will remove it, as well as any connected edges, from the graph. Are you sure you want to delete this node?',
+            deleteProperty: 'Are you sure you want to delete this property? It can be viewed later by clicking through the history seciton.',
+            deleteEdge: 'Deleting an edge will remove it from the graph. Are you sure you want to delete this edge?',
+            deleteNode: 'Deleting a node will remove it, as well as any connected edges, from the graph. Are you sure you want to delete this node?',
             deleteTag: 'Are you sure you want to detach this tag?',
             importContainer:
                 'Note that importing type mappings requires also importing data sources, and type mappings may require certain ontology elements in order to transfer completely.',
             inactiveMappings: 'Please note that any data sources or type mappings imported are set as inactive.',
             rootClass: 'Please note that this will create a root class with no parent class.',
+            deleteTemplate: 
+                'Deleting a Data Source Template means it will be unrecoverable to even administrative users. Only delete templates you know are no longer needed or that were created in error. Any data sources created from this template will be maintained (they will not be deleted).'
         },
         general: {
             default: 'Default',
@@ -306,6 +312,7 @@ export default {
             settings: 'Settings',
             constant: 'Constant Value',
             addColumn: 'Add Column',
+            addField: 'Add Field',
             keys: 'Keys',
             date: 'Date',
             dateFormat: 'Date Format',
@@ -331,6 +338,7 @@ export default {
             archive: 'Archive',
             parent: 'Parent',
             owner: 'Owner',
+            merge: 'Merge',
         },
         validation: {
             validEmail: 'Email must be valid',
@@ -615,11 +623,37 @@ export default {
             editConfigured: 'Edit Configured Source',
             deleteConfigured: 'Delete Configured Source',
             authorizeAdapter: 'Authorize Adapter for Container',
-            authContainerP6: 'The P6 adapter must be authorized to access this container before P6 data sources can be activated. Click the Authorize button to authorize this container.',
+            authContainerP6:
+                'The P6 adapter must be authorized to access this container before P6 data sources can be activated. Click the Authorize button to authorize this container.',
             deleteConfiguredConfirm: 'Would you like to delete this pre-set Data Source configuration?',
             selectEnabled: 'Select Enabled Data Source Types',
             reprocess: 'Reprocess Data Source',
             selected: 'Selected Data Sources',
+            customName: 'Custom',
+            customDescription: 'Custom data sources use Data Source Templates as their config object. Choose an existing template from the container, or select "New Template" to create a new one.'
+        },
+        dataSourceTemplates: {
+            title: 'Data Source Templates',
+            name: 'Template Name',
+            select: 'Select Data Source Template',
+            description:
+                "Data Source Templates are designed to prsdovide flexible structure for DeepLynx adapters. Custom fields can be used to store information that is necessary for adapters to function, such as log-in credentials or fields that specify the target resource.",
+            redirect: 'Redirect Address',
+            configure: 'Configure Data Source Templates',
+            new: 'New Data Source Template',
+            requireField: 'Require Field',
+            encryptField: 'Encrypt Field',
+            customFields: 'Custom Fields',
+            save: 'Save Template to Container',
+            create: 'Create Template',
+            import: 'Import Template(s)',
+            authorize: 'Authorize Template',
+            edit: 'Edit Template',
+            delete: 'Delete Template',
+            authorizeDescription:
+                'The custom adapter located at this redirect address needs to be granted access to this container in order to send it data. Click the Authorize button to grant this adapter access to the container.',
+            editNote:
+                'Note that editing this template will NOT alter existing copies of this template being used in data sources.'
         },
         timeseries: {
             fastloadEnabled: 'Fast Load Enabled',
diff --git a/AdminWebApp/src/views/ViewDataImports.vue b/AdminWebApp/src/views/ViewDataImports.vue
index de3ac1f68..1667b6a5a 100644
--- a/AdminWebApp/src/views/ViewDataImports.vue
+++ b/AdminWebApp/src/views/ViewDataImports.vue
@@ -17,7 +17,6 @@
       <SelectDataSource
         :containerID="containerID"
         :showArchived="true"
-        :dataSourceID="argument"
         @selected="setDataSource"
         ref="selectDataSource"
       />
diff --git a/AdminWebApp/src/views/ViewDataMapping.vue b/AdminWebApp/src/views/ViewDataMapping.vue
index 13551617d..ec08bc43f 100644
--- a/AdminWebApp/src/views/ViewDataMapping.vue
+++ b/AdminWebApp/src/views/ViewDataMapping.vue
@@ -15,7 +15,6 @@
         <SelectDataSource
           :containerID="containerID"
           :show-archived="true"
-          :dataSourceID="argument"
           @selected="setDataSource">
         </SelectDataSource>
       </div>
diff --git a/AdminWebApp/src/views/ViewDataSources.vue b/AdminWebApp/src/views/ViewDataSources.vue
index 464d5542f..f4b2b7469 100644
--- a/AdminWebApp/src/views/ViewDataSources.vue
+++ b/AdminWebApp/src/views/ViewDataSources.vue
@@ -1,334 +1,89 @@
 <template>
   <div>
     <v-tabs grow v-model="activeTab">
-      <v-tab @click="activeTab = 0; refreshDataSources()" ref="datasources">
+      <v-tab @click="activeTab = 0" ref="datasources">
         {{ $t('dataSources.dataSources') }}
       </v-tab>
-      <v-tab @click="activeTab = 1; refreshTimeseriesDataSources()" ref="timeseriesDatasources">
+      <v-tab @click="activeTab = 1" ref="timeseriesDatasources">
         {{ $t('timeseries.timeseries') }}
       </v-tab>
+      <v-tab v-if="customEnabled"
+        @click="activeTab = 2" 
+        ref="templates"
+      >
+        {{ $t('dataSourceTemplates.title') }}
+      </v-tab>
     </v-tabs>
 
     <error-banner :message="errorMessage" @closeAlert="errorMessage = ''"></error-banner>
 
-    <v-data-table
-        v-if="activeTab === 0"
-        :headers="headers()"
-        :items="dataSources"
-        :loading="dataSourcesLoading"
-        class="elevation-1"
-        :search="search"
-    >
-      <template v-slot:top>
-        <v-toolbar flat color="white">
-          <v-toolbar-title>{{$t('dataSources.description')}}</v-toolbar-title>
-          <v-spacer></v-spacer>
-          <DataSourceActions
-            :icon="false"
-            mode="create"
-            :containerID="containerID"
-            @dataSourceCreated="refreshDataSources(); refreshTimeseriesDataSources()"
-          />
-
-          <template v-slot:extension>
-            <v-text-field
-                v-model="search"
-                prepend-icon="mdi-magnify"
-                label="Search"
-                single-line
-                hide-details
-            ></v-text-field>
-          </template>
-
-        </v-toolbar>
-      </template>
-      <template v-slot:[`item.copy`]="{ item }">
-        <v-tooltip top>
-          <template v-slot:activator="{on, attrs}">
-            <v-icon v-bind="attrs" v-on="on" @click="copyID(item.id)">{{copy}}</v-icon>
-          </template>
-          <span>{{$t('general.copyID')}}</span>
-          <span>{{item.id}}</span>
-        </v-tooltip>
-      </template>
-      <template v-slot:[`item.name`]="{ item }">
-        <span v-if="!item.archived">{{item.name}}</span>
-        <span v-else class="text--disabled">{{item.name}}</span>
-      </template>
-      <template v-slot:[`item.adapter_type`]="{ item }">
-        <span v-if="!item.archived">{{item.adapter_type}}</span>
-        <span v-else class="text--disabled">{{item.adapter_type}}</span>
-      </template>
-      <template v-slot:[`item.active`]="{ item }">
-        <v-switch
-          v-if="!item.archived"
-          @change="toggleDataSourceActive(item)"
-          v-model="item.active"
-          class="mt-0"
-          hide-details
-        />
-        <v-switch
-          v-else
-          :value="false"
-          class="mt-0"
-          hide-details
-          disabled
-        />
-      </template>
-      <template v-slot:[`item.actions`]="{ item }">
-        <DataSourceActions
-          mode="edit"
-          :icon="true"
-          :containerID="containerID"
-          :dataSource="item"
-          @dataSourceUpdated="refreshDataSources"
-        />
-        <DataSourceActions
-          mode="delete"
-          :icon="true"
-          @dataSourceArchived="refreshDataSources()"
-          @dataSourceDeleted="refreshDataSources()"
-          :containerID="item.container_id"
-          :dataSource="item"
-        />
-        <DataSourceActions
-          v-if="!item.archived"
-          mode="archive"
-          :icon="true"
-          @dataSourceArchived="refreshDataSources()"
-          :containerID="item.container_id"
-          :dataSource="item"
-        />
-        <DataSourceActions
-          mode="reprocess"
-          :icon="true"
-          :containerID="containerID"
-          :dataSource="item"
-          @dataSourceReprocessed="refreshDataSources()"
-        />
-      </template>
-    </v-data-table>
-
-    <v-data-table
-        v-if="activeTab === 1"
-        :headers="headers()"
-        :items="timeseriesDataSources"
-        class="elevation-1"
-        :search="search"
-    >
-      <template v-slot:top>
-        <v-toolbar flat color="white">
-          <v-toolbar-title>{{$t('dataSources.description')}}</v-toolbar-title>
-          <v-spacer></v-spacer>
-          <DataSourceActions
-            :icon="false"
-            mode="create"
-            :timeseries="true"
-            :containerID="containerID"
-            @dataSourceCreated="refreshDataSources(); refreshTimeseriesDataSources()"
-            @timeseriesSourceCreated="activeTab === 1"
-          ></DataSourceActions>
-
-          <template v-slot:extension>
-            <v-text-field
-                v-model="search"
-                prepend-icon="mdi-magnify"
-                label="Search"
-                single-line
-                hide-details
-            ></v-text-field>
-          </template>
-
-        </v-toolbar>
-      </template>
-      <template v-slot:[`item.copy`]="{ item }">
-        <v-tooltip top>
-          <template v-slot:activator="{on, attrs}">
-            <v-icon v-bind="attrs" v-on="on" @click="copyID(item.id)">{{copy}}</v-icon>
-          </template>
-          <span>{{$t('general.copyID')}}</span>
-          <span>{{item.id}}</span>
-        </v-tooltip>
-      </template>
-      <template v-slot:[`item.name`]="{ item }">
-        <span v-if="!item.archived">{{item.name}}</span>
-        <span v-else class="text--disabled">{{item.name}}</span>
-      </template>
-      <template v-slot:[`item.adapter_type`]="{ item }">
-        <span v-if="!item.archived">{{item.adapter_type}}</span>
-        <span v-else class="text--disabled">{{item.adapter_type}}</span>
-      </template>
-      <template v-slot:[`item.fastload`]="{ item }">
-        <span>{{ item.config.fast_load_enabled }}</span>
-      </template>
-      <template v-slot:[`item.active`]="{ item }">
-        <v-switch
-            v-if="!item.archived"
-            @change="toggleDataSourceActive(item)"
-            v-model="item.active"
-            class="mt-0"
-            hide-details
-        />
-        <v-switch
-            v-else
-            :value="false"
-            class="mt-0"
-            hide-details
-            disabled
-        />
-      </template>
-      <template v-slot:[`item.actions`]="{ item }">
-        <TimeseriesViewerDialog v-if="activeTab === 1"
-          :containerID="containerID"
-          :dataSourceID="item.id"
-          :icon="true"
-          :key="timeseriesKey"
-          @timeseriesDialogClose="incrementKey"
-          :ref="`${item.id}viewer`"
-        ></TimeseriesViewerDialog>
-        <DataSourceActions
-          mode="edit"
-          :icon="true"
-          :containerID="containerID"
-          :dataSource="item"
-          @dataSourceUpdated="refreshTimeseriesDataSources"
-          :timeseries="true"
-        />
-        <DataSourceActions
-          mode="delete"
-          @dataSourceArchived="refreshTimeseriesDataSources()"
-          @dataSourceDeleted="refreshTimeseriesDataSources()"
-          :containerID="item.container_id"
-          :dataSource="item"
-          :timeseries="true"
-        />
-        <DataSourceActions
-          v-if="!item.archived"
-          mode="archive"
-          @dataSourceArchived="refreshTimeseriesDataSources()"
-          :containerID="item.container_id"
-          :dataSource="item"
-          :timeseries="true"
-        />
-      </template>
-    </v-data-table>
+    <DataSourceTable v-if="activeTab === 0"
+      :containerID="containerID"
+      @error="setErrorMessage"
+    />
+
+    <TimeseriesSourceTable v-if="activeTab === 1"
+      :containerID="containerID"
+      @error="setErrorMessage"
+      @timeseriesTab="activeTab === 1"
+    />
+
+    <DataSourceTemplateTable v-if="activeTab === 2"
+      :containerID="containerID"
+      @error="setErrorMessage"
+    />
   </div>
 </template>
 
 <script lang="ts">
   import Vue from 'vue'
-  import {DataSourceT} from "@/api/types";
-  import {mdiFileDocumentMultiple} from "@mdi/js";
-  import TimeseriesViewerDialog from '@/components/data/TimeseriesViewerDialog.vue';
-  import DataSourceActions from '@/components/dataSources/DataSourceActions.vue';
+  import {ContainerT} from "@/api/types";
+  import DataSourceTable from '@/components/dataSources/DataSourceTable.vue';
+  import TimeseriesSourceTable from '@/components/dataSources/TimeseriesSourceTable.vue';
+  import DataSourceTemplateTable from '@/components/dataSources/dataSourceTemplates/DataSourceTemplateTable.vue';
 
   interface DataSourcesModel {
-    dataSources: DataSourceT[]
-    timeseriesDataSources: DataSourceT[]
     tabs: {id: number, name: string}[]
     activeTab: number
-    select: string
-    dataSourcesLoading: boolean
-    timeseriesLoading: boolean
     errorMessage: string
-    copy: string
-    timeseriesKey: number
-    search: string
+    container: ContainerT | undefined
   }
 
   export default Vue.extend ({
     name: 'ViewDataSources',
 
-    components: { TimeseriesViewerDialog, DataSourceActions },
+    components: { DataSourceTable, TimeseriesSourceTable, DataSourceTemplateTable },
 
     props: {
       containerID: {required: true, type: String},
     },
 
+    computed: {
+      customEnabled(): boolean {
+        // disable data source templates tab if custom data source is not enabled
+        return this.container!.config.enabled_data_sources.includes('custom');
+      }
+    },
+
     data: (): DataSourcesModel => ({
-      dataSources: [],
-      timeseriesDataSources: [],
       tabs: [
         {id: 0, name: 'datasources'},
         {id: 1, name: 'timeseriesDatasources'}
       ],
       activeTab: 0,
-      select: "",
-      dataSourcesLoading: false,
-      timeseriesLoading: false,
       errorMessage: "",
-      copy: mdiFileDocumentMultiple,
-      timeseriesKey: 0,
-      search: ""
+      container: undefined,
     }),
 
-    mounted () {
-      this.refreshDataSources()
-      this.refreshTimeseriesDataSources()
+    beforeMount () {
       this.activeTab = 0;
+      this.container = this.$store.getters.activeContainer;
     },
 
     methods: {
-      headers() {
-        const headers = [
-          { text: '', value: 'copy'},
-          { text: this.$t('general.id'), value: 'id'},
-          { text: this.$t('general.name'), value: 'name' },
-          { text: this.$t('dataSources.adapterType'), value: 'adapter_type'},
-          { text: this.$t('general.active'), value: 'active', filterable: false},
-          { text: this.$t('general.actions'), value: 'actions', sortable: false, filterable: false }
-        ]
-
-        if (this.activeTab === 1) {
-          headers.splice(4, 0, {
-            text: this.$t('timeseries.fastloadEnabled'), value: 'fastload', filterable: false
-          })
-        }
-
-        return headers;
-      },
-      refreshDataSources() {
-        this.dataSourcesLoading = true
-        this.$client.listDataSources(this.containerID, true, false)
-            .then(dataSources => {
-              this.dataSources = dataSources
-            })
-            .catch(e => this.errorMessage = e)
-            .finally(() => this.dataSourcesLoading = false)
-      },
-      refreshTimeseriesDataSources() {
-        this.timeseriesLoading = true
-        this.$client.listDataSources(this.containerID, true, true)
-            .then(dataSources => {
-              this.timeseriesDataSources= dataSources
-            })
-            .catch(e => this.errorMessage = e)
-            .finally(() => {
-              this.timeseriesLoading = false
-            })
-      },
-      toggleDataSourceActive(dataSource: DataSourceT) {
-        if(dataSource.active) {
-          this.$client.activateDataSource(this.containerID, dataSource.id!)
-              .then(()=> {
-                this.refreshDataSources()
-              })
-              .catch(e => this.errorMessage = e)
-        } else {
-          this.$client.deactivateDataSource(this.containerID, dataSource.id!)
-              .then(()=> {
-                this.refreshDataSources()
-              })
-              .catch((e: any) => this.errorMessage = e)
-        }
-      },
-      incrementKey() {
-        this.timeseriesKey += 1
-        this.$router.replace(`/containers/${this.containerID}/data-sources`)
-      },
-      copyID(id: string) {
-        navigator.clipboard.writeText(id)
+      setErrorMessage(message: string) {
+        this.errorMessage = message;
       }
     }
   });
-</script>
+</script>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 4e84c03c9..7aadba253 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ RUN apk add build-base musl-dev openssl-dev
 RUN apk update add --update nodejs=18.16.0-r1
 RUN apk add --update npm
 RUN npm install -g @napi-rs/cli
-RUN npm install -g yarn
+RUN corepack enable
 
 RUN mkdir /srv/core_api
 WORKDIR /srv/core_api
@@ -41,6 +41,7 @@ WORKDIR /srv/core_api
 COPY package*.json ./
 COPY yarn.lock ./
 
+RUN corepack enable
 RUN npm install npm@latest --location=global
 RUN npm update --location=global
 RUN npm install pm2 --location=global
diff --git a/NodeLibraries/deeplynx/.config.yml b/NodeLibraries/deeplynx/.config.yml
new file mode 100644
index 000000000..0912c0aa9
--- /dev/null
+++ b/NodeLibraries/deeplynx/.config.yml
@@ -0,0 +1,3 @@
+db_connection_string: postgresql://postgres:deeplynxcore@localhost/deep_lynx
+redis_connection_string: redis://localhost:6379
+max_columns:
\ No newline at end of file
diff --git a/NodeLibraries/deeplynx/index.d.ts b/NodeLibraries/deeplynx/index.d.ts
index 354206309..d0a2f6374 100644
--- a/NodeLibraries/deeplynx/index.d.ts
+++ b/NodeLibraries/deeplynx/index.d.ts
@@ -56,5 +56,5 @@ export class RedisGraphLoader {
    * This function should be called before any work done on the object
    */
   init(config: Configuration): Promise<void>
-  generateRedisGraph(containerId: string, timestamp?: string | undefined | null): Promise<void>
+  generateRedisGraph(containerId: string, timestamp?: string | undefined | null, ttl?: number | undefined | null): Promise<string>
 }
diff --git a/NodeLibraries/deeplynx/package.json b/NodeLibraries/deeplynx/package.json
index 4f0bb3fe6..2e1f1e069 100644
--- a/NodeLibraries/deeplynx/package.json
+++ b/NodeLibraries/deeplynx/package.json
@@ -27,4 +27,4 @@
     "universal": "napi universal",
     "version": "napi version"
   }
-}
+}
\ No newline at end of file
diff --git a/NodeLibraries/deeplynx/src/errors.rs b/NodeLibraries/deeplynx/src/errors.rs
index dffba4d1a..e77393cb0 100644
--- a/NodeLibraries/deeplynx/src/errors.rs
+++ b/NodeLibraries/deeplynx/src/errors.rs
@@ -1,6 +1,5 @@
 use napi::Error;
 use std::io;
-use std::num::ParseIntError;
 use thiserror::Error;
 use crate::redis_graph::redis_errors::RedisLoaderError;
 
diff --git a/NodeLibraries/deeplynx/src/redis_graph.rs b/NodeLibraries/deeplynx/src/redis_graph.rs
index 144b6c841..8255edc4e 100644
--- a/NodeLibraries/deeplynx/src/redis_graph.rs
+++ b/NodeLibraries/deeplynx/src/redis_graph.rs
@@ -37,7 +37,8 @@ impl JsRedisGraphLoader {
         &self,
         container_id: String,
         timestamp: Option<String>,
-    ) -> Result<(), napi::Error> {
+        ttl: Option<i64>,
+    ) -> Result<String, napi::Error> {
         let inner = self.inner.clone().ok_or(napi::Error::new(
             napi::Status::GenericFailure,
             "must call init before calling functions",
@@ -50,10 +51,11 @@ impl JsRedisGraphLoader {
                     .parse::<u64>()
                     .map_err(|e| napi::Error::new(napi::Status::GenericFailure, e.to_string()))?,
                 timestamp,
+                ttl,
             ) // to u64 is a safe cast because container_id isn't negative
             .await
         {
-            Ok(_) => Ok(()),
+            Ok(key) => Ok(key),
             Err(e) => Err(napi::Error::new(
                 napi::Status::GenericFailure,
                 e.to_string(),
diff --git a/NodeLibraries/deeplynx/src/redis_graph/loader.rs b/NodeLibraries/deeplynx/src/redis_graph/loader.rs
index 2355f2840..2d35026b8 100644
--- a/NodeLibraries/deeplynx/src/redis_graph/loader.rs
+++ b/NodeLibraries/deeplynx/src/redis_graph/loader.rs
@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use sqlx::{PgPool, Pool, Postgres, Row};
 use std::collections::HashMap;
+use futures_util::stream::BoxStream;
 use tokio_util::compat::FuturesAsyncReadCompatExt;
 
 #[derive(Clone)]
@@ -43,17 +44,24 @@ impl RedisGraphLoader {
   /// to quickly load the data from Postgres into RedisGraph. Due to how we have to format the RedisGraph
   /// bulkloader, we do tend to max out memory with how we read records into it and the fact we have
   /// to keep track of all the new ids for the nodes
-  // TODO: right now generate only does current graph, need to actually make it work with timestamps
   pub async fn generate_redis_graph(
     &self,
     container_id: u64,
     timestamp: Option<String>,
-  ) -> Result<(), RedisLoaderError> {
+    ttl: Option<i64>,
+  ) -> Result<String, RedisLoaderError> {
     let mut connection = self.db.acquire().await?;
-    let stream = connection
+
+    let timestamp_val = timestamp.clone().unwrap_or("default".to_string());
+    let key: String = format!("{}-{}", container_id, timestamp_val);
+    self.verify_redis_key(key.clone()).await?;
+
+    let stream;
+    if timestamp_val == "default" {
+      stream = connection
             .copy_out_raw(
-                format!(
-                    r#"
+              format!(
+                r#"
  COPY (SELECT q.*,  ROW_NUMBER () OVER(ORDER BY metatype_id) as new_id FROM (SELECT DISTINCT ON (nodes.id) nodes.id,
     nodes.container_id,
     nodes.metatype_id,
@@ -78,10 +86,46 @@ impl RedisGraphLoader {
   ORDER BY nodes.id, nodes.created_at) q ORDER BY q.metatype_id)
 TO STDOUT WITH (FORMAT csv, HEADER true) ;
     "#
-                )
-                    .as_str(),
+              )
+                  .as_str(),
             )
             .await?;
+    } else {
+      stream = connection
+          .copy_out_raw(
+            format!(
+              r#"
+ COPY (SELECT q.*,  ROW_NUMBER () OVER(ORDER BY metatype_id) as new_id FROM (SELECT DISTINCT ON (nodes.id) nodes.id,
+    nodes.container_id,
+    nodes.metatype_id,
+    nodes.data_source_id,
+    nodes.import_data_id,
+    nodes.data_staging_id,
+    nodes.type_mapping_transformation_id,
+    nodes.original_data_id,
+    nodes.properties,
+    nodes.metadata_properties,
+    nodes.metadata,
+    nodes.created_at,
+    nodes.modified_at,
+    nodes.deleted_at,
+    nodes.created_by,
+    nodes.modified_by,
+    metatypes.name AS metatype_name,
+    metatypes.uuid AS metatype_uuid
+   FROM (nodes
+     LEFT JOIN metatypes ON ((metatypes.id = nodes.metatype_id)))
+  WHERE (nodes.container_id = {container_id})
+  AND nodes.created_at <= '{timestamp_val}'
+  AND (nodes.deleted_at > '{timestamp_val}' OR nodes.deleted_at IS NULL)
+  ORDER BY nodes.id, nodes.created_at) q ORDER BY q.metatype_id)
+TO STDOUT WITH (FORMAT csv, HEADER true) ;
+    "#
+            )
+                .as_str(),
+          )
+          .await?;
+    }
 
     let async_reader = stream
       // we have to convert the error so that we can turn it into an AsyncReader
@@ -143,9 +187,8 @@ TO STDOUT WITH (FORMAT csv, HEADER true) ;
       if (current_size + properties.as_slice().len()) > 496 * 1_000_000 {
         self
           .transmit_to_redis(
+            key.clone(),
             &current_buffer,
-            container_id,
-            timestamp.clone().unwrap_or("default".to_string()),
             (node_count, metatype_name_header.len() as u64),
             (0, 0),
             has_txed,
@@ -173,9 +216,8 @@ TO STDOUT WITH (FORMAT csv, HEADER true) ;
     // track of multiple buffers. TODO: benchmark additional requests against potentially just one
     self
       .transmit_to_redis(
+        key.clone(),
         &current_buffer,
-        container_id,
-        timestamp.clone().unwrap_or("default".to_string()),
         (node_count, metatype_name_header.len() as u64),
         (0, 0),
         has_txed,
@@ -186,10 +228,12 @@ TO STDOUT WITH (FORMAT csv, HEADER true) ;
     let mut connection = self.db.acquire().await?;
 
     // now let's handle the edges TODO: move this into its own functions
-    let stream = connection
-            .copy_out_raw(
-                format!(
-                    r#"
+    let stream;
+    if timestamp_val == "default" {
+      stream = connection
+          .copy_out_raw(
+            format!(
+              r#"
   COPY (SELECT q.* FROM (SELECT DISTINCT ON (edges.origin_id, edges.destination_id, edges.data_source_id, edges.relationship_pair_id) edges.id,
     edges.container_id,
     edges.relationship_pair_id,
@@ -227,12 +271,61 @@ TO STDOUT WITH (FORMAT csv, HEADER true) ;
   WHERE (edges.deleted_at IS NULL) AND (edges.container_id = {container_id}::bigint)
   ORDER BY edges.origin_id, edges.destination_id, edges.data_source_id, edges.relationship_pair_id, edges.id, edges.created_at DESC) as q ORDER BY metatype_relationship_name)
 TO STDOUT WITH (FORMAT csv, HEADER true);"#
-                )
-                    .as_str(),
             )
-            .await?;
+                .as_str(),
+          )
+          .await?;
+    } else {
+      stream = connection
+          .copy_out_raw(
+            format!(
+              r#"
+  COPY (SELECT q.* FROM (SELECT DISTINCT ON (edges.origin_id, edges.destination_id, edges.data_source_id, edges.relationship_pair_id) edges.id,
+    edges.container_id,
+    edges.relationship_pair_id,
+    edges.data_source_id,
+    edges.import_data_id,
+    edges.data_staging_id,
+    edges.type_mapping_transformation_id,
+    edges.origin_id,
+    edges.origin_original_id,
+    edges.origin_data_source_id,
+    edges.origin_metatype_id,
+    origin.uuid AS origin_metatype_uuid,
+    edges.destination_id,
+    edges.destination_original_id,
+    edges.destination_data_source_id,
+    edges.destination_metatype_id,
+    destination.uuid AS destination_metatype_uuid,
+    edges.properties,
+    edges.metadata_properties,
+    edges.metadata,
+    edges.created_at,
+    edges.modified_at,
+    edges.deleted_at,
+    edges.created_by,
+    edges.modified_by,
+    metatype_relationship_pairs.relationship_id,
+    metatype_relationships.name AS metatype_relationship_name,
+    metatype_relationships.uuid AS metatype_relationship_uuid,
+    metatype_relationship_pairs.uuid AS metatype_relationship_pair_uuid
+   FROM ((((edges
+     LEFT JOIN metatype_relationship_pairs ON ((edges.relationship_pair_id = metatype_relationship_pairs.id)))
+     LEFT JOIN metatype_relationships ON ((metatype_relationship_pairs.relationship_id = metatype_relationships.id)))
+     LEFT JOIN metatypes origin ON ((edges.origin_metatype_id = origin.id)))
+     LEFT JOIN metatypes destination ON ((edges.destination_metatype_id = destination.id)))
+  WHERE (edges.deleted_at IS NULL) AND (edges.container_id = {container_id}::bigint)
+  AND (edges.created_at <= '{timestamp_val}')
+  AND (edges.deleted_at > '{timestamp_val}' OR edges.deleted_at IS NULL)
+  ORDER BY edges.origin_id, edges.destination_id, edges.data_source_id, edges.relationship_pair_id, edges.id, edges.created_at DESC) as q ORDER BY metatype_relationship_name)
+TO STDOUT WITH (FORMAT csv, HEADER true);"#
+            )
+                .as_str(),
+          )
+          .await?;
+    }
 
-    let async_reader = stream
+      let async_reader = stream
       // we have to convert the error so that we can turn it into an AsyncReader
       .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
       .into_async_read();
@@ -286,9 +379,8 @@ TO STDOUT WITH (FORMAT csv, HEADER true);"#
       if (current_size + properties.as_slice().len() + 16) > 496 * 1_000_000 {
         self
           .transmit_to_redis(
+            key.clone(),
             &current_buffer,
-            container_id,
-            timestamp.clone().unwrap_or("default".to_string()),
             (0, 0),
             (edge_count, relationship_name_header.len() as u64),
             has_txed,
@@ -331,23 +423,42 @@ TO STDOUT WITH (FORMAT csv, HEADER true);"#
     // track of multiple buffers. TODO: benchmark additional requests against potentially just one
     self
       .transmit_to_redis(
+        key.clone(),
         &current_buffer,
-        container_id,
-        timestamp.clone().unwrap_or("default".to_string()),
         (0, 0),
         (edge_count, relationship_name_header.len() as u64),
         has_txed,
       )
       .await?;
 
+    self.set_key_expiry(key.clone(),ttl).await?;
+
+    Ok(key.clone())
+  }
+
+  async fn verify_redis_key(&self, key: String) -> Result<(), RedisLoaderError> {
+    // check if the key (graph) already exists, and remove if found
+    let mut async_conn = self.redis_client.get_async_connection().await?;
+
+    let key_exists:i32 = redis::cmd("EXISTS")
+      .arg(key.clone())
+      .query_async(&mut async_conn)
+      .await?;
+
+    if key_exists == 1 {
+      redis::cmd("DEL")
+          .arg(key.clone())
+          .query_async(&mut async_conn)
+          .await?;
+    }
+
     Ok(())
   }
 
   async fn transmit_to_redis(
     &self,
+    key: String,
     payload: &Vec<Vec<u8>>,
-    container_id: u64,
-    timestamp: String,
     // we're doing tuples to stress the relationship between the labels and nodes (it also looks cool)
     nodes_labels: (u64, u64),
     edges_types: (u64, u64),
@@ -358,7 +469,7 @@ TO STDOUT WITH (FORMAT csv, HEADER true);"#
     // BEGIN starts a new graph if the key doesn't exist, if it does - then we ignore this and add
     if !has_txed {
       redis::cmd("GRAPH.BULK")
-        .arg(format!("{}-{}", container_id, timestamp))
+        .arg(key)
         .arg("BEGIN")
         .arg(nodes_labels.0)
         .arg(edges_types.0)
@@ -369,7 +480,7 @@ TO STDOUT WITH (FORMAT csv, HEADER true);"#
         .await?;
     } else {
       redis::cmd("GRAPH.BULK")
-        .arg(format!("{}-{}", container_id, timestamp))
+        .arg(key)
         .arg(nodes_labels.0)
         .arg(edges_types.0)
         .arg(nodes_labels.1)
@@ -381,6 +492,25 @@ TO STDOUT WITH (FORMAT csv, HEADER true);"#
 
     Ok(())
   }
+
+  async fn set_key_expiry(
+    &self,
+    key: String,
+    ttl: Option<i64>,
+  ) -> Result<(), RedisLoaderError> {
+    let mut async_conn = self.redis_client.get_async_connection().await?;
+
+    // use provided ttl or else default
+    let graph_ttl = ttl.unwrap_or(3600);
+
+    redis::cmd("EXPIRE")
+        .arg(key)
+        .arg(graph_ttl)
+        .query_async(&mut async_conn)
+        .await?;
+
+    Ok(())
+  }
 }
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -402,12 +532,16 @@ struct Node {
   modified_by: String,
   modified_at: String,
   metatype_name: String,
+  import_data_id: Option<u64>,
+  type_mapping_transformation_id: Option<u64>,
+  data_staging_id: String, // uuid
+  metadata: String
 }
 
 impl Node {
   // returns parsed header and an index of property names to make sure order stays the same
   pub fn to_redis_header_bytes(&self, metatype_properties: Vec<String>) -> (Vec<u8>, Vec<String>) {
-    let property_len: u32 = metatype_properties.len() as u32 + 9;
+    let property_len: u32 = metatype_properties.len() as u32 + 15; // integer should correspond to number of properties added below
     let mut property_names: Vec<u8> = vec![];
     let mut property_names_raw: Vec<String> = vec![];
 
@@ -415,11 +549,17 @@ impl Node {
     property_names.extend("_data_source_id\0".as_bytes());
     property_names.extend("_container_id\0".as_bytes());
     property_names.extend("_original_data_id\0".as_bytes());
+    property_names.extend("_metatype_id\0".as_bytes());
+    property_names.extend("_metatype_name\0".as_bytes());
     property_names.extend("_metadata_properties\0".as_bytes());
     property_names.extend("_created_at\0".as_bytes());
     property_names.extend("_created_by\0".as_bytes());
     property_names.extend("_modified_at\0".as_bytes());
     property_names.extend("_modified_by\0".as_bytes());
+    property_names.extend("_import_data_id\0".as_bytes());
+    property_names.extend("_type_mapping_transformation_id\0".as_bytes());
+    property_names.extend("_data_staging_id\0".as_bytes());
+    property_names.extend("_metadata\0".as_bytes());
 
     for key in metatype_properties.iter() {
       let name = key.as_bytes();
@@ -447,9 +587,13 @@ impl Node {
 
     let mut property_final: Vec<u8> = vec![];
 
+    // order of properties must match header definition in to_redis_header_bytes
+    // strings must be null terminated
+    // numbers that could be null should be checked and 0_i8 pushed if null
     property_final.extend(4_i8.to_ne_bytes());
     property_final.extend(self.id.to_ne_bytes());
 
+    // add null check here
     property_final.extend(4_i8.to_ne_bytes());
     property_final.extend(self.data_source_id.to_ne_bytes());
 
@@ -460,6 +604,13 @@ impl Node {
     property_final.extend(self.original_data_id.as_bytes());
     property_final.extend("\0".as_bytes());
 
+    property_final.extend(4_i8.to_ne_bytes());
+    property_final.extend(self.metatype_id.to_ne_bytes());
+
+    property_final.extend(3_i8.to_ne_bytes());
+    property_final.extend(self.metatype_name.as_bytes());
+    property_final.extend("\0".as_bytes());
+
     property_final.extend(3_i8.to_ne_bytes());
     property_final.extend(self.metadata_properties.as_bytes());
     property_final.extend("\0".as_bytes());
@@ -480,6 +631,30 @@ impl Node {
     property_final.extend(self.modified_by.as_bytes());
     property_final.extend("\0".as_bytes());
 
+    match self.import_data_id.clone() {
+      None => property_final.extend(0_i8.to_ne_bytes()),
+      Some(value) => {
+        property_final.extend(4_i8.to_ne_bytes());
+        property_final.extend(self.import_data_id.unwrap().to_ne_bytes());
+      }
+    }
+
+    match self.type_mapping_transformation_id.clone() {
+      None => property_final.extend(0_i8.to_ne_bytes()),
+      Some(value) => {
+        property_final.extend(4_i8.to_ne_bytes());
+        property_final.extend(self.type_mapping_transformation_id.unwrap().to_ne_bytes());
+      }
+    }
+
+    property_final.extend(3_i8.to_ne_bytes());
+    property_final.extend(self.data_staging_id.as_bytes());
+    property_final.extend("\0".as_bytes());
+
+    property_final.extend(3_i8.to_ne_bytes());
+    property_final.extend(self.metadata.as_bytes());
+    property_final.extend("\0".as_bytes());
+
 
     for property_name in index_names {
       match properties.get(property_name.as_str()) {
@@ -555,13 +730,16 @@ impl Edge {
     &self,
     metatype_relationship_properties: Vec<String>,
   ) -> (Vec<u8>, Vec<String>) {
-    let property_len: u32 = metatype_relationship_properties.len() as u32 + 8;
+    let property_len: u32 = metatype_relationship_properties.len() as u32 + 11;
     let mut property_names: Vec<u8> = vec![];
     let mut property_names_raw: Vec<String> = vec![];
 
     property_names.extend("_deeplynx_id\0".as_bytes());
     property_names.extend("_data_source_id\0".as_bytes());
     property_names.extend("_container_id\0".as_bytes());
+    property_names.extend("_origin_id\0".as_bytes());
+    property_names.extend("_destination_id\0".as_bytes());
+    property_names.extend("_relationship_pair_id\0".as_bytes());
     property_names.extend("_metadata_properties\0".as_bytes());
     property_names.extend("_created_at\0".as_bytes());
     property_names.extend("_created_by\0".as_bytes());
@@ -603,6 +781,15 @@ impl Edge {
     property_final.extend(4_i8.to_ne_bytes());
     property_final.extend(self.container_id.to_ne_bytes());
 
+    property_final.extend(4_i8.to_ne_bytes());
+    property_final.extend(self.origin_id.to_ne_bytes());
+
+    property_final.extend(4_i8.to_ne_bytes());
+    property_final.extend(self.destination_id.to_ne_bytes());
+
+    property_final.extend(4_i8.to_ne_bytes());
+    property_final.extend(self.relationship_pair_id.to_ne_bytes());
+
     property_final.extend(3_i8.to_ne_bytes());
     property_final.extend(self.metadata_properties.as_bytes());
     property_final.extend("\0".as_bytes());
@@ -697,11 +884,21 @@ pub async fn fetch_possible_metatype_relationship_properties(
   container_id: u64,
   connection: &Pool<Postgres>,
 ) -> Result<Vec<String>, RedisLoaderError> {
-  let mut rows = sqlx::query("SELECT DISTINCT property_name FROM metatype_relationship_keys WHERE container_id = $1 AND metatype_name = $2")
+  let mut rows = sqlx::query("SELECT DISTINCT relationship_id FROM metatype_full_relationship_pairs WHERE container_id = $1 AND relationship_name = $2")
       .bind(container_id as i64)
       .bind(metatype_relationship_name)
       .fetch(connection);
 
+  let mut metatype_relationship_id: i64 = 0;
+  while let Some(row) = rows.try_next().await? {
+    metatype_relationship_id = row.try_get("relationship_id")?;
+  }
+
+  let mut rows = sqlx::query("SELECT DISTINCT property_name FROM metatype_relationship_keys WHERE container_id = $1 AND metatype_relationship_id = $2")
+      .bind(container_id.clone() as i64)
+      .bind(metatype_relationship_id)
+      .fetch(connection);
+
   let mut results = vec![];
   while let Some(row) = rows.try_next().await? {
     // map the row into a user-defined domain type
diff --git a/NodeLibraries/deeplynx/src/redis_graph/redis_tests.rs b/NodeLibraries/deeplynx/src/redis_graph/redis_tests.rs
index fc124a501..b33365288 100644
--- a/NodeLibraries/deeplynx/src/redis_graph/redis_tests.rs
+++ b/NodeLibraries/deeplynx/src/redis_graph/redis_tests.rs
@@ -12,7 +12,7 @@ mod main_tests {
 
         // TODO: make sure you change this for an existing DeepLynx container in the db
         // no way I was going to try and recreate a graph simply for this test
-        redis_loader.generate_redis_graph(45, None).await?;
+        redis_loader.generate_redis_graph(1297, None, None).await?;
 
         Ok(())
     }
diff --git a/NodeLibraries/deeplynx/src/timeseries.rs b/NodeLibraries/deeplynx/src/timeseries.rs
index 325fd17ac..a25695a22 100644
--- a/NodeLibraries/deeplynx/src/timeseries.rs
+++ b/NodeLibraries/deeplynx/src/timeseries.rs
@@ -7,7 +7,6 @@ mod timeseries_tests;
 use crate::config::Configuration;
 use crate::timeseries::repository::{BucketRepository, LegacyTimeseriesColumn};
 use napi::bindgen_prelude::Buffer;
-use serde::{Deserialize, Serialize};
 
 #[napi(js_name = "BucketRepository")]
 pub struct JsBucketRepository {
diff --git a/NodeLibraries/deeplynx/src/timeseries/ingestion.rs b/NodeLibraries/deeplynx/src/timeseries/ingestion.rs
index bd9fdd7a0..5c274c983 100644
--- a/NodeLibraries/deeplynx/src/timeseries/ingestion.rs
+++ b/NodeLibraries/deeplynx/src/timeseries/ingestion.rs
@@ -2,7 +2,6 @@ use crate::timeseries::data_types::LegacyDataTypes;
 use crate::timeseries::repository::LegacyTimeseriesColumn;
 use crate::timeseries::timeseries_errors::{TimeseriesError, ValidationError};
 use chrono::NaiveDateTime;
-use futures::StreamExt;
 use sqlx::{Pool, Postgres};
 use std::io::Read;
 
diff --git a/NodeLibraries/deeplynx/src/timeseries/repository.rs b/NodeLibraries/deeplynx/src/timeseries/repository.rs
index 41231a62d..05cd45947 100644
--- a/NodeLibraries/deeplynx/src/timeseries/repository.rs
+++ b/NodeLibraries/deeplynx/src/timeseries/repository.rs
@@ -2,20 +2,10 @@ use crate::config::Configuration;
 use crate::timeseries::data_types::LegacyDataTypes;
 use crate::timeseries::ingestion;
 use crate::timeseries::timeseries_errors::TimeseriesError;
-use chrono::NaiveDateTime;
-use rand::distributions::Alphanumeric;
-use rand::Rng;
-use serde::{Deserialize, Serialize};
-use serde_json::json;
 use sqlx::postgres::PgPool;
-use sqlx::types::Json;
-use sqlx::{Executor, Postgres, Transaction};
-use std::collections::HashMap;
 use std::io::Read;
 use std::sync::Arc;
 use tokio::sync::mpsc::error::TryRecvError;
-use uuid::Uuid;
-use validator::{HasLen, Validate};
 
 #[derive(Clone, Debug)]
 #[napi(object)]
diff --git a/NodeLibraries/deeplynx/src/timeseries/timeseries_errors.rs b/NodeLibraries/deeplynx/src/timeseries/timeseries_errors.rs
index 6526e6768..cf8f09a5d 100644
--- a/NodeLibraries/deeplynx/src/timeseries/timeseries_errors.rs
+++ b/NodeLibraries/deeplynx/src/timeseries/timeseries_errors.rs
@@ -1,5 +1,4 @@
 use napi::Error;
-use std::io;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -54,4 +53,6 @@ pub enum TestError {
   SqlXMigration(#[from] sqlx::migrate::MigrateError),
   #[error("system IO error: {0}")]
   IO(#[from] std::io::Error),
+  #[error("unwrap error {0}")]
+  Unwrap(String),
 }
diff --git a/NodeLibraries/deeplynx/yarn.lock b/NodeLibraries/deeplynx/yarn.lock
new file mode 100644
index 000000000..6a4172266
--- /dev/null
+++ b/NodeLibraries/deeplynx/yarn.lock
@@ -0,0 +1,898 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@napi-rs/cli@^2.16.2":
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-2.16.3.tgz#6943d0614bbb4900a97b18ae074f735864f78c4b"
+  integrity sha512-3mLNPlbbOhpbIUKicLrJtIearlHXUuXL3UeueYyRRplpVMNkdn8xCyzY6PcYZi3JXR8bmCOiWgkVmLnrSL7DKw==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+acorn-walk@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
+acorn@^8.8.2:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
+
+aggregate-error@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e"
+  integrity sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==
+  dependencies:
+    clean-stack "^4.0.0"
+    indent-string "^5.0.0"
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^6.0.0, ansi-styles@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
+anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==
+
+arrgv@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arrgv/-/arrgv-1.0.2.tgz#025ed55a6a433cad9b604f8112fc4292715a6ec0"
+  integrity sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==
+
+arrify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-3.0.0.tgz#ccdefb8eaf2a1d2ab0da1ca2ce53118759fd46bc"
+  integrity sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==
+
+ava@^5.1.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ava/-/ava-5.3.1.tgz#335737dd963b7941b90214836cea2e8de1f4d5f4"
+  integrity sha512-Scv9a4gMOXB6+ni4toLuhAm9KYWEjsgBglJl+kMGI5+IVDt120CCDZyB5HNU9DjmLI2t4I0GbnxGLmmRfGTJGg==
+  dependencies:
+    acorn "^8.8.2"
+    acorn-walk "^8.2.0"
+    ansi-styles "^6.2.1"
+    arrgv "^1.0.2"
+    arrify "^3.0.0"
+    callsites "^4.0.0"
+    cbor "^8.1.0"
+    chalk "^5.2.0"
+    chokidar "^3.5.3"
+    chunkd "^2.0.1"
+    ci-info "^3.8.0"
+    ci-parallel-vars "^1.0.1"
+    clean-yaml-object "^0.1.0"
+    cli-truncate "^3.1.0"
+    code-excerpt "^4.0.0"
+    common-path-prefix "^3.0.0"
+    concordance "^5.0.4"
+    currently-unhandled "^0.4.1"
+    debug "^4.3.4"
+    emittery "^1.0.1"
+    figures "^5.0.0"
+    globby "^13.1.4"
+    ignore-by-default "^2.1.0"
+    indent-string "^5.0.0"
+    is-error "^2.2.2"
+    is-plain-object "^5.0.0"
+    is-promise "^4.0.0"
+    matcher "^5.0.0"
+    mem "^9.0.2"
+    ms "^2.1.3"
+    p-event "^5.0.1"
+    p-map "^5.5.0"
+    picomatch "^2.3.1"
+    pkg-conf "^4.0.0"
+    plur "^5.1.0"
+    pretty-ms "^8.0.0"
+    resolve-cwd "^3.0.0"
+    stack-utils "^2.0.6"
+    strip-ansi "^7.0.1"
+    supertap "^3.0.1"
+    temp-dir "^3.0.0"
+    write-file-atomic "^5.0.1"
+    yargs "^17.7.2"
+
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+blueimp-md5@^2.10.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0"
+  integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==
+
+braces@^3.0.2, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+callsites@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-4.1.0.tgz#de72b98612eed4e1e2564c952498677faa9d86c2"
+  integrity sha512-aBMbD1Xxay75ViYezwT40aQONfr+pSXTHwNKvIXhXD6+LY3F1dLIcceoC5OZKBVHbXcysz1hL9D2w0JJIMXpUw==
+
+cbor@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/cbor/-/cbor-8.1.0.tgz#cfc56437e770b73417a2ecbfc9caf6b771af60d5"
+  integrity sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==
+  dependencies:
+    nofilter "^3.1.0"
+
+chalk@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
+
+chokidar@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+chunkd@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/chunkd/-/chunkd-2.0.1.tgz#49cd1d7b06992dc4f7fccd962fe2a101ee7da920"
+  integrity sha512-7d58XsFmOq0j6el67Ug9mHf9ELUXsQXYJBkyxhH/k+6Ke0qXRnv0kbemx+Twc6fRJ07C49lcbdgm9FL1Ei/6SQ==
+
+ci-info@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+
+ci-parallel-vars@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ci-parallel-vars/-/ci-parallel-vars-1.0.1.tgz#e87ff0625ccf9d286985b29b4ada8485ca9ffbc2"
+  integrity sha512-uvzpYrpmidaoxvIQHM+rKSrigjOe9feHYbw4uOI2gdfe1C3xIlxO+kVXq83WQWNniTf8bAxVpy+cQeFQsMERKg==
+
+clean-stack@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-4.2.0.tgz#c464e4cde4ac789f4e0735c5d75beb49d7b30b31"
+  integrity sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==
+  dependencies:
+    escape-string-regexp "5.0.0"
+
+clean-yaml-object@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68"
+  integrity sha512-3yONmlN9CSAkzNwnRCiJQ7Q2xK5mWuEfL3PuTZcAUzhObbXsfsnMptJzXwz93nc5zn9V9TwCVMmV7w4xsm43dw==
+
+cli-truncate@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389"
+  integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==
+  dependencies:
+    slice-ansi "^5.0.0"
+    string-width "^5.0.0"
+
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
+code-excerpt@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/code-excerpt/-/code-excerpt-4.0.0.tgz#2de7d46e98514385cb01f7b3b741320115f4c95e"
+  integrity sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA==
+  dependencies:
+    convert-to-spaces "^2.0.1"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+common-path-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
+  integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
+
+concordance@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/concordance/-/concordance-5.0.4.tgz#9896073261adced72f88d60e4d56f8efc4bbbbd2"
+  integrity sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==
+  dependencies:
+    date-time "^3.1.0"
+    esutils "^2.0.3"
+    fast-diff "^1.2.0"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.15"
+    md5-hex "^3.0.1"
+    semver "^7.3.2"
+    well-known-symbols "^2.0.0"
+
+convert-to-spaces@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/convert-to-spaces/-/convert-to-spaces-2.0.1.tgz#61a6c98f8aa626c16b296b862a91412a33bceb6b"
+  integrity sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==
+
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==
+  dependencies:
+    array-find-index "^1.0.1"
+
+date-time@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/date-time/-/date-time-3.1.0.tgz#0d1e934d170579f481ed8df1e2b8ff70ee845e1e"
+  integrity sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==
+  dependencies:
+    time-zone "^1.0.0"
+
+debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
+emittery@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-1.0.1.tgz#e0cf36e2d7eef94dbd025969f642d57ae50a56cd"
+  integrity sha512-2ID6FdrMD9KDLldGesP6317G78K7km/kMcwItRtVFva7I/cSEOIaLpewaUb+YLXVwdAp3Ctfxh/V5zIl1sj7dQ==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-string-regexp@5.0.0, escape-string-regexp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
+
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esutils@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+fast-diff@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
+
+fast-glob@^3.3.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fastq@^1.6.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  dependencies:
+    reusify "^1.0.4"
+
+figures@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-5.0.0.tgz#126cd055052dea699f8a54e8c9450e6ecfc44d5f"
+  integrity sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+    is-unicode-supported "^1.2.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
+  integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
+  dependencies:
+    locate-path "^7.1.0"
+    path-exists "^5.0.0"
+
+fsevents@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+glob-parent@^5.1.2, glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+globby@^13.1.4:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
+  integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
+  dependencies:
+    dir-glob "^3.0.1"
+    fast-glob "^3.3.0"
+    ignore "^5.2.4"
+    merge2 "^1.4.1"
+    slash "^4.0.0"
+
+ignore-by-default@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-2.1.0.tgz#c0e0de1a99b6065bdc93315a6f728867981464db"
+  integrity sha512-yiWd4GVmJp0Q6ghmM2B/V3oZGRmjrKLXvHR3TE1nfoXsmoggllfZUQe74EN0fJdPFZu2NIvNdrMMLm3OsV7Ohw==
+
+ignore@^5.2.4:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+indent-string@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5"
+  integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==
+
+irregular-plurals@^3.3.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-3.5.0.tgz#0835e6639aa8425bdc8b0d33d0dc4e89d9c01d2b"
+  integrity sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-error@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-error/-/is-error-2.2.2.tgz#c10ade187b3c93510c5470a5567833ee25649843"
+  integrity sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-fullwidth-code-point@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
+  integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
+
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
+is-promise@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
+  integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==
+
+is-unicode-supported@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz#d824984b616c292a2e198207d4a609983842f714"
+  integrity sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==
+
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==
+
+js-yaml@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+load-json-file@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-7.0.1.tgz#a3c9fde6beffb6bedb5acf104fad6bb1604e1b00"
+  integrity sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==
+
+locate-path@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
+  integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
+  dependencies:
+    p-locate "^6.0.0"
+
+lodash@^4.17.15:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+map-age-cleaner@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
+matcher@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/matcher/-/matcher-5.0.0.tgz#cd82f1c7ae7ee472a9eeaf8ec7cac45e0fe0da62"
+  integrity sha512-s2EMBOWtXFc8dgqvoAzKJXxNHibcdJMV0gwqKUaw9E2JBJuGUK7DrNKrA6g/i+v72TT16+6sVm5mS3thaMLQUw==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+
+md5-hex@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c"
+  integrity sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==
+  dependencies:
+    blueimp-md5 "^2.10.0"
+
+mem@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-9.0.2.tgz#bbc2d40be045afe30749681e8f5d554cee0c0354"
+  integrity sha512-F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A==
+  dependencies:
+    map-age-cleaner "^0.1.3"
+    mimic-fn "^4.0.0"
+
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  dependencies:
+    braces "^3.0.2"
+    picomatch "^2.3.1"
+
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+nofilter@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-3.1.0.tgz#c757ba68801d41ff930ba2ec55bab52ca184aa66"
+  integrity sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==
+
+p-event@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/p-event/-/p-event-5.0.1.tgz#614624ec02ae7f4f13d09a721c90586184af5b0c"
+  integrity sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==
+  dependencies:
+    p-timeout "^5.0.2"
+
+p-limit@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
+  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
+  dependencies:
+    yocto-queue "^1.0.0"
+
+p-locate@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
+  integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
+  dependencies:
+    p-limit "^4.0.0"
+
+p-map@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715"
+  integrity sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==
+  dependencies:
+    aggregate-error "^4.0.0"
+
+p-timeout@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b"
+  integrity sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==
+
+parse-ms@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-3.0.0.tgz#3ea24a934913345fcc3656deda72df921da3a70e"
+  integrity sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw==
+
+path-exists@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
+  integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+pkg-conf@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-4.0.0.tgz#63ace00cbacfa94c2226aee133800802d3e3b80c"
+  integrity sha512-7dmgi4UY4qk+4mj5Cd8v/GExPo0K+SlY+hulOSdfZ/T6jVH6//y7NtzZo5WrfhDBxuQ0jCa7fLZmNaNh7EWL/w==
+  dependencies:
+    find-up "^6.0.0"
+    load-json-file "^7.0.0"
+
+plur@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/plur/-/plur-5.1.0.tgz#bff58c9f557b9061d60d8ebf93959cf4b08594ae"
+  integrity sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==
+  dependencies:
+    irregular-plurals "^3.3.0"
+
+pretty-ms@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-8.0.0.tgz#a35563b2a02df01e595538f86d7de54ca23194a3"
+  integrity sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q==
+  dependencies:
+    parse-ms "^3.0.0"
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+semver@^7.3.2:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+serialize-error@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
+  integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
+  dependencies:
+    type-fest "^0.13.1"
+
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+slash@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
+
+slice-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"
+  integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==
+  dependencies:
+    ansi-styles "^6.0.0"
+    is-fullwidth-code-point "^4.0.0"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+
+stack-utils@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
+supertap@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/supertap/-/supertap-3.0.1.tgz#aa89e4522104402c6e8fe470a7d2db6dc4037c6a"
+  integrity sha512-u1ZpIBCawJnO+0QePsEiOknOfCRq0yERxiAchT0i4li0WHNUJbf0evXXSXOcCAR4M8iMDoajXYmstm/qO81Isw==
+  dependencies:
+    indent-string "^5.0.0"
+    js-yaml "^3.14.1"
+    serialize-error "^7.0.1"
+    strip-ansi "^7.0.1"
+
+temp-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-3.0.0.tgz#7f147b42ee41234cc6ba3138cd8e8aa2302acffa"
+  integrity sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==
+
+time-zone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
+  integrity sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+type-fest@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
+  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
+
+well-known-symbols@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/well-known-symbols/-/well-known-symbols-2.0.0.tgz#e9c7c07dbd132b7b84212c8174391ec1f9871ba5"
+  integrity sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+write-file-atomic@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
+  integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^4.0.1"
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
+yocto-queue@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
+  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
diff --git a/docker-compose.yml b/docker-compose.yml
index a21f96b59..616678ecd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     ports:
       - "5432:5432"
   redis:
-    image: "redis/redis-stack:latest"
+    image: "redis/redis-stack:6.2.6-v9"
     ports:
       - "6379:6379"
       - "8001:8001"
diff --git a/package.json b/package.json
index d3de62514..39c59a3ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "deep-lynx",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "description": "DeepLynx allows for an integrated platform during design and operations of mega projects.",
     "main": "./dist/main.js",
     "author": "John Darrington and Christopher Ritter",
@@ -185,5 +185,5 @@
         "*.js": "eslint --cache --fix",
         "*.{js,css,md}": "prettier --write"
     },
-    "packageManager": "yarn@3.6.1"
+    "packageManager": "yarn@4.0.2"
 }
diff --git a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
index d43808143..7bfbec0fd 100644
--- a/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/data/node_mapper.ts
@@ -34,8 +34,8 @@ export default class NodeMapper extends Mapper {
     // been processed) we have modified the standard create statements to also
     // potentially update records if the composite id and data source match a known
     // record
-    public async CreateOrUpdateByCompositeID(userID: string, node: Node, transaction?: PoolClient): Promise<Result<Node>> {
-        const r = await super.run(this.createOrUpdateStatement(userID, node), {
+    public async CreateOrUpdateByCompositeID(userID: string, node: Node, transaction?: PoolClient, merge = false): Promise<Result<Node>> {
+        const r = await super.run(this.createOrUpdateStatement(userID, merge, node), {
             transaction,
             resultClass: this.resultClass,
         });
@@ -44,15 +44,15 @@ export default class NodeMapper extends Mapper {
         return Promise.resolve(Result.Success(r.value[0]));
     }
 
-    public BulkCreateOrUpdateByCompositeID(userID: string, nodes: Node[], transaction?: PoolClient): Promise<Result<Node[]>> {
-        return super.run(this.createOrUpdateStatement(userID, ...nodes), {
+    public BulkCreateOrUpdateByCompositeID(userID: string, nodes: Node[], transaction?: PoolClient, merge = false): Promise<Result<Node[]>> {
+        return super.run(this.createOrUpdateStatement(userID, merge, ...nodes), {
             transaction,
             resultClass: this.resultClass,
         });
     }
 
-    public async Update(userID: string, node: Node, transaction?: PoolClient): Promise<Result<Node>> {
-        const r = await super.run(this.fullUpdateStatement(userID, node), {
+    public async Update(userID: string, node: Node, transaction?: PoolClient, merge = false): Promise<Result<Node>> {
+        const r = await super.run(this.fullUpdateStatement(userID, merge, node), {
             transaction,
             resultClass: this.resultClass,
         });
@@ -61,8 +61,8 @@ export default class NodeMapper extends Mapper {
         return Promise.resolve(Result.Success(r.value[0]));
     }
 
-    public BulkUpdate(userID: string, nodes: Node[], transaction?: PoolClient): Promise<Result<Node[]>> {
-        return super.run(this.fullUpdateStatement(userID, ...nodes), {
+    public BulkUpdate(userID: string, nodes: Node[], merge: boolean, transaction?: PoolClient): Promise<Result<Node[]>> {
+        return super.run(this.fullUpdateStatement(userID, merge, ...nodes), {
             transaction,
             resultClass: this.resultClass,
         });
@@ -147,8 +147,66 @@ export default class NodeMapper extends Mapper {
     // and the return value is something that the postgres-node driver can understand
     // My hope is that this method will allow us to be flexible and create more complicated
     // queries more easily.
-    private createOrUpdateStatement(userID: string, ...nodes: Node[]): string {
-        const text = `INSERT INTO nodes(
+    private createOrUpdateStatement(userID: string, merge = false, ...nodes: Node[]): string {
+        // similar to the node_insert_trigger, join to nodes on original_data_id, metatype_id, and data_source_id
+        // in order to perform a merge on a node for which we do not have a DeepLynx ID (data from type mappings)
+        const text = merge
+            ? `INSERT INTO nodes(
+                    container_id,
+                    metatype_id,
+                    properties,
+                    metadata_properties,
+                    original_data_id,
+                    data_source_id,
+                    type_mapping_transformation_id,
+                    import_data_id,
+                    data_staging_id,
+                    metadata,
+                    created_by,
+                    modified_by,
+                    created_at)
+               SELECT
+                   u.container_id::int8,
+                   u.metatype_id::int8,
+                   n.properties::jsonb || u.properties::jsonb,
+                   n.metadata_properties::jsonb || u.metadata_properties::jsonb,
+                   u.original_data_id::text,
+                   u.data_source_id::int8,
+                   u.type_mapping_transformation_id::int8,
+                   u.import_data_id::int8,
+                   u.data_staging_id::uuid,
+                   u.metadata::jsonb,
+                   u.created_by::text,
+                   u.modified_by::text,
+                   u.created_at::TIMESTAMP
+               FROM (VALUES %L) AS u(
+                     container_id,
+                     metatype_id,
+                     properties,
+                     metadata_properties,
+                     original_data_id,
+                     data_source_id,
+                     type_mapping_transformation_id,
+                     import_data_id,
+                     data_staging_id,
+                     metadata,
+                     created_by,
+                     modified_by,
+                     created_at)
+                LEFT JOIN nodes n ON u.original_data_id = n.original_data_id
+                   AND u.metatype_id::int8 = n.metatype_id
+                   AND u.data_source_id::int8 = n.data_source_id
+                WHERE n.created_at < u.created_at::TIMESTAMP
+                ORDER BY n.created_at DESC LIMIT 1
+                  ON CONFLICT(created_at, id) DO UPDATE SET
+                      properties = nodes.properties || EXCLUDED.properties,
+                      metadata = EXCLUDED.metadata,
+                      metadata_properties = nodes.metadata_properties || EXCLUDED.metadata_properties,
+                      deleted_at = EXCLUDED.deleted_at
+                  WHERE EXCLUDED.id = nodes.id AND EXCLUDED.properties IS DISTINCT FROM nodes.properties
+                        AND EXCLUDED.metadata_properties IS DISTINCT FROM nodes.metadata_properties
+                   RETURNING *`
+            : `INSERT INTO nodes(
                   container_id,
                   metatype_id,
                   properties,
@@ -167,6 +225,7 @@ export default class NodeMapper extends Mapper {
                       metadata = EXCLUDED.metadata,
                       deleted_at = EXCLUDED.deleted_at
                   WHERE EXCLUDED.id = nodes.id AND EXCLUDED.properties IS DISTINCT FROM nodes.properties
+                        AND EXCLUDED.metadata_properties IS DISTINCT FROM nodes.metadata_properties
                    RETURNING *`;
 
         const values = nodes.map((n) => [
@@ -188,22 +247,82 @@ export default class NodeMapper extends Mapper {
         return format(text, values);
     }
 
-    private fullUpdateStatement(userID: string, ...nodes: Node[]): string {
-        const text = `INSERT INTO nodes(
-            id,
-            container_id,
-            metatype_id,
-            properties,
-            metadata_properties,
-            original_data_id,
-            data_source_id,
-            type_mapping_transformation_id,
-            import_data_id,
-            data_staging_id,
-            metadata,
-            created_by,
-            modified_by,
-            created_at) VALUES %L RETURNING *`;
+    private fullUpdateStatement(userID: string, merge: boolean, ...nodes: Node[]): string {
+        // the merge query needs to account for merging properties and metadata_properties
+        // as well as ensuring the node with which a merge occurs is the directly preceding
+        // version of the node, as the created_at can be provided by the user
+        const text = merge
+            ? `INSERT INTO nodes(
+                  id,
+                  container_id,
+                  metatype_id,
+                  properties,
+                  metadata_properties,
+                  original_data_id,
+                  data_source_id,
+                  type_mapping_transformation_id,
+                  import_data_id,
+                  data_staging_id,
+                  metadata,
+                  created_by,
+                  modified_by,
+                  created_at)
+         SELECT
+                  u.id::int8,
+                  u.container_id::int8,
+                  u.metatype_id::int8,
+                  n.properties::jsonb || u.properties::jsonb,
+                  n.metadata_properties::jsonb || u.metadata_properties::jsonb,
+                  u.original_data_id::text,
+                  u.data_source_id::int8,
+                  u.type_mapping_transformation_id::int8,
+                  u.import_data_id::int8,
+                  u.data_staging_id::uuid,
+                  u.metadata::jsonb,
+                  u.created_by::text,
+                  u.modified_by::text,
+                  u.created_at::TIMESTAMP
+           FROM (VALUES %L) AS u(
+                  id,
+                  container_id,
+                  metatype_id,
+                  properties,
+                  metadata_properties,
+                  original_data_id,
+                  data_source_id,
+                  type_mapping_transformation_id,
+                  import_data_id,
+                  data_staging_id,
+                  metadata,
+                  created_by,
+                  modified_by,
+                  created_at)
+            LEFT JOIN nodes n ON u.id::int8 = n.id
+            WHERE n.created_at < u.created_at::TIMESTAMP
+            ORDER BY n.created_at DESC LIMIT 1
+            ON CONFLICT(created_at, id) DO UPDATE SET
+                   properties = nodes.properties || EXCLUDED.properties,
+                   metadata = EXCLUDED.metadata,
+                   metadata_properties = nodes.metadata_properties || EXCLUDED.metadata_properties,
+                   deleted_at = EXCLUDED.deleted_at
+            WHERE EXCLUDED.id = nodes.id AND EXCLUDED.properties IS DISTINCT FROM nodes.properties
+                AND EXCLUDED.metadata_properties IS DISTINCT FROM nodes.metadata_properties
+            RETURNING *`
+            : `INSERT INTO nodes(
+                  id,
+                  container_id,
+                  metatype_id,
+                  properties,
+                  metadata_properties,
+                  original_data_id,
+                  data_source_id,
+                  type_mapping_transformation_id,
+                  import_data_id,
+                  data_staging_id,
+                  metadata,
+                  created_by,
+                  modified_by,
+                  created_at) VALUES %L RETURNING *`;
 
         const values = nodes.map((n) => [
             n.id,
diff --git a/src/data_access_layer/mappers/data_warehouse/etl/type_transformation_mapper.ts b/src/data_access_layer/mappers/data_warehouse/etl/type_transformation_mapper.ts
index 4321a1bf4..9639b486f 100644
--- a/src/data_access_layer/mappers/data_warehouse/etl/type_transformation_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/etl/type_transformation_mapper.ts
@@ -1,6 +1,6 @@
 import Result from '../../../../common_classes/result';
 import Mapper from '../../mapper';
-import { PoolClient, QueryConfig } from 'pg';
+import {PoolClient, QueryConfig} from 'pg';
 import TypeTransformation from '../../../../domain_objects/data_warehouse/etl/type_transformation';
 
 const format = require('pg-format');
@@ -69,7 +69,7 @@ export default class TypeTransformationMapper extends Mapper {
     }
 
     public async ListForTypeMapping(typeMappingID: string): Promise<Result<TypeTransformation[]>> {
-        return super.rows<TypeTransformation>(this.listByMapping(typeMappingID), { resultClass: this.resultClass });
+        return super.rows<TypeTransformation>(this.listByMapping(typeMappingID), {resultClass: this.resultClass});
     }
 
     public async ListFromIDs(ids: string[]): Promise<Result<TypeTransformation[]>> {
@@ -77,7 +77,7 @@ export default class TypeTransformationMapper extends Mapper {
             return Result.Success([]);
         }
 
-        return super.rows(this.listFromIDsStatement(ids), { resultClass: this.resultClass });
+        return super.rows(this.listFromIDsStatement(ids), {resultClass: this.resultClass});
     }
 
     public async BulkDelete(transformations: TypeTransformation[], transaction?: PoolClient): Promise<Result<boolean>> {
@@ -133,6 +133,7 @@ export default class TypeTransformationMapper extends Mapper {
             created_at_key,
             created_at_format_string,
             tags,
+            merge,
             created_by,
             modified_by) VALUES %L RETURNING *)
 
@@ -170,6 +171,7 @@ export default class TypeTransformationMapper extends Mapper {
             tt.created_at_key,
             tt.created_at_format_string,
             JSON.stringify(tt.tags),
+            tt.merge,
             userID,
             userID,
         ]);
@@ -201,6 +203,7 @@ export default class TypeTransformationMapper extends Mapper {
             created_at_key = u.created_at_key::text,
             created_at_format_string = u.created_at_format_string::text,
             tags = u.tags::jsonb,
+            merge = u.merge::boolean,
             modified_by = u.modified_by,
             modified_at = NOW()
             FROM (VALUES %L) as u(
@@ -227,6 +230,7 @@ export default class TypeTransformationMapper extends Mapper {
                             created_at_key,
                             created_at_format_string,
                             tags,
+                            merge,
                             modified_by
                           ) WHERE u.id::bigint= t.id RETURNING t.*)
 
@@ -264,6 +268,7 @@ export default class TypeTransformationMapper extends Mapper {
             tt.created_at_key,
             tt.created_at_format_string,
             JSON.stringify(tt.tags),
+            tt.merge,
             userID,
             userID,
         ]);
diff --git a/src/data_access_layer/mappers/data_warehouse/ontology/container_mapper.ts b/src/data_access_layer/mappers/data_warehouse/ontology/container_mapper.ts
index af4850032..ef5ed469b 100644
--- a/src/data_access_layer/mappers/data_warehouse/ontology/container_mapper.ts
+++ b/src/data_access_layer/mappers/data_warehouse/ontology/container_mapper.ts
@@ -1,4 +1,4 @@
-import Container from '../../../../domain_objects/data_warehouse/ontology/container';
+import Container, { DataSourceTemplate } from '../../../../domain_objects/data_warehouse/ontology/container';
 import Result from '../../../../common_classes/result';
 import Mapper from '../../mapper';
 import {PoolClient, QueryConfig} from 'pg';
@@ -94,6 +94,168 @@ export default class ContainerMapper extends Mapper {
         return super.runStatement(this.deleteStatement(containerID));
     }
 
+    public async CreateDataSourceTemplate(
+        template: DataSourceTemplate,
+        containerID: string,
+        transaction?: PoolClient
+    ): Promise<Result<DataSourceTemplate[]>> {
+        const r = await super.run(this.createDataSourceTemplateStatement([template], containerID), {
+            transaction,
+        });
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into an array of DataSourceTemplates;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        const resultsArray: DataSourceTemplate[] = (r.value[0] as {data_source_templates: any}).data_source_templates;
+
+        return Promise.resolve(Result.Success(resultsArray));
+    }
+
+    public async BulkCreateDataSourceTemplates(
+        templates: DataSourceTemplate[],
+        containerID: string,
+        transaction?: PoolClient
+    ): Promise<Result<DataSourceTemplate[]>> {
+        const r = await super.run(this.createDataSourceTemplateStatement(templates, containerID), {
+            transaction
+        });
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into an array of DataSourceTemplates;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        const resultsArray: DataSourceTemplate[] = (r.value[0] as {data_source_templates: any}).data_source_templates;
+
+        return Promise.resolve(Result.Success(resultsArray));
+    }
+
+    public async RetrieveDataSourceTemplateByID(templateID: string, containerID: string): Promise<Result<DataSourceTemplate>> {
+        const r = await super.retrieve(this.retrieveDataSourceTemplateByIDStatement(templateID, containerID));
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into a proper DataSourceTemplate;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        let result: DataSourceTemplate | undefined;
+        try {
+            result = (r.value as object)['jsonb_agg' as keyof object][0];
+        } catch {
+            return Promise.resolve(Result.Failure(`data source template ${templateID} not found`, 404));
+        }
+
+        return Promise.resolve(Result.Success(result));
+    }
+
+    public async RetrieveDataSourceTemplateByName(templateName: string, containerID: string): Promise<Result<DataSourceTemplate>> {
+        const r = await super.retrieve(this.retrieveDataSourceTemplateByNameStatement(templateName, containerID));
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into a proper DataSourceTemplate;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        let result: DataSourceTemplate | undefined;
+        try {
+            result = (r.value as object)['jsonb_agg' as keyof object][0];
+        } catch {
+            return Promise.resolve(Result.Failure(`data source template ${templateName} not found`, 404));
+        }
+
+        return Promise.resolve(Result.Success(result));
+    }
+
+    public async ListDataSourceTemplates(containerID: string): Promise<Result<DataSourceTemplate[]>> {
+        const r = await super.retrieve(this.listDataSourceTemplatesStatement(containerID));
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into an array of DataSourceTemplates;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        const resultsArray = JSON.parse((r.value as object)['data_source_templates' as keyof object]);
+
+        return Promise.resolve(Result.Success(resultsArray));
+    }
+
+    public async UpdateDataSourceTemplate(
+        template: DataSourceTemplate,
+        containerID: string,
+        transaction?: PoolClient
+    ): Promise<Result<DataSourceTemplate[]>> {
+        const r = await super.run(this.updateDataSourceTemplateStatement(template, containerID), {
+            transaction
+        });
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into an array of DataSourceTemplates;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        const resultsArray: DataSourceTemplate[] = JSON.parse(
+            (r.value[0] as {data_source_templates: string}).data_source_templates
+        );
+
+        return Promise.resolve(Result.Success(resultsArray));
+    }
+
+    public async DeleteDataSourceTemplate(
+        templateID: string,
+        containerID: string,
+        transaction?: PoolClient
+    ): Promise<Result<DataSourceTemplate[]>> {
+        const r = await super.run(this.deleteDataSourceTemplateStatement([templateID], containerID), {
+            transaction
+        });
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into an array of DataSourceTemplates;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        const resultsArray: DataSourceTemplate[] = JSON.parse(
+            (r.value[0] as {data_source_templates: string}).data_source_templates
+        );
+
+        return Promise.resolve(Result.Success(resultsArray));
+    }
+
+    public async BulkDeleteDataSourceTemplates(
+        templateIDs: string[],
+        containerID: string,
+        transaction?: PoolClient
+    ): Promise<Result<DataSourceTemplate[]>> {
+        const r = await super.run(this.deleteDataSourceTemplateStatement(templateIDs, containerID), {
+            transaction
+        });
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into an array of DataSourceTemplates;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        const resultsArray: DataSourceTemplate[] = JSON.parse(
+            (r.value[0] as {data_source_templates: string}).data_source_templates
+        );
+
+        return Promise.resolve(Result.Success(resultsArray));
+    }
+
+    public async AuthorizeDataSourceTemplate(
+        templateName: string,
+        containerID: string,
+        transaction?: PoolClient
+    ): Promise<Result<DataSourceTemplate[]>> {
+        const r = await super.run(this.authorizeDataSourceTemplateStatement(templateName, containerID), {
+            transaction
+        });
+        if (r.isError) return Promise.resolve(Result.Pass(r));
+
+        // we have to convert the returned object into an array of DataSourceTemplates;
+        // unfortunately the class conversion in the root mapper doesn't work since
+        // the SQL returns the results as a single field
+        const resultsArray: DataSourceTemplate[] = JSON.parse(
+            (r.value[0] as {data_source_templates: string}).data_source_templates
+        );
+
+        return Promise.resolve(Result.Success(resultsArray));
+    }
+
     // Below are a set of query building functions. So far they're very simple
     // and the return value is something that the postgres-node driver can understand
     // My hope is that this method will allow us to be flexible and create more complicated
@@ -165,9 +327,8 @@ export default class ContainerMapper extends Mapper {
         const text = `SELECT c.*
                     FROM containers c
                     WHERE c.id IN(%L)`;
-        const values = ids;
 
-        return format(text, values);
+        return format(text, ids);
     }
 
     private listForServiceUserStatement(userID: string): QueryConfig {
@@ -179,4 +340,105 @@ export default class ContainerMapper extends Mapper {
             values: [userID],
         };
     }
+
+    // add a new template to data_source_templates, or create the array if not exists
+    // only return the recently created data source template(s) for use in the repository
+    private createDataSourceTemplateStatement(templates: DataSourceTemplate[], containerID: string): QueryConfig {
+        const templateIDs = templates.map(t => t.id);
+        return {
+            text: `UPDATE containers AS c SET
+                config = jsonb_set(config, '{data_source_templates}',
+                    CASE
+                        WHEN config->'data_source_templates' IS NULL THEN $1::jsonb
+                        ELSE config->'data_source_templates' || $1::jsonb
+                    END
+                ) WHERE c.id = $2
+                RETURNING (
+                    SELECT jsonb_agg(e)
+                    FROM jsonb_array_elements(c.config->'data_source_templates') AS e
+                    WHERE e->>'id' = ANY($3)
+                ) AS data_source_templates`,
+            values: [JSON.stringify(templates), containerID, templateIDs]
+        }
+    }
+
+    private retrieveDataSourceTemplateByIDStatement(templateID: string, containerID: string): QueryConfig {
+        return {
+            text: `SELECT jsonb_agg(e)
+                FROM containers c, jsonb_array_elements(c.config->'data_source_templates') AS e
+                WHERE e->>'id' = $1 AND c.id = $2`,
+            values: [templateID, containerID]
+        }
+    }
+
+    private retrieveDataSourceTemplateByNameStatement(templateName: string, containerID: string): QueryConfig {
+        return {
+            text: `SELECT jsonb_agg(e)
+                FROM containers c, jsonb_array_elements(c.config->'data_source_templates') AS e
+                WHERE e->>'name' = $1 AND c.id = $2`,
+            values: [templateName, containerID]
+        }
+    }
+
+    private listDataSourceTemplatesStatement(containerID: string): QueryConfig {
+        return {
+            text: `SELECT c.config->>'data_source_templates' AS data_source_templates
+                FROM containers c
+                WHERE c.id = $1`,
+            values: [containerID],
+        }
+    }
+
+    // This is good enough for singular updates, but for bulk updates it is more straightforward
+    // to do a bulk delete followed by a bulk insert. The alternative is a very complex CTE or
+    // repeating this call (n) times. Bulk updates are performed in this manner in the repository
+    // layer, within a transaction.
+    private updateDataSourceTemplateStatement(template: DataSourceTemplate, containerID: string): QueryConfig {
+        return {
+            text: `UPDATE containers AS c SET
+                config = jsonb_set(config, '{data_source_templates}', (
+                    SELECT jsonb_agg(
+                        CASE
+                            WHEN e->>'id' = $1 THEN $2::jsonb
+                            ELSE e
+                        END
+                    ) FROM jsonb_array_elements(c.config->'data_source_templates') AS e
+                )) WHERE c.id = $3
+                RETURNING c.config->>'data_source_templates' AS data_source_templates`,
+            values: [template.id!, JSON.stringify(template), containerID]
+        }
+    }
+
+    // if all items are deleted, set the array to an empty array instead of null
+    private deleteDataSourceTemplateStatement(templateIDs: string[], containerID: string): QueryConfig {
+        return {
+            text: `UPDATE containers AS c SET
+                config = jsonb_set(config, '{data_source_templates}', (
+                    SELECT CASE
+                        WHEN COUNT(e) = 0 THEN '[]'::jsonb
+                        ELSE jsonb_agg(e)
+                    END
+                    FROM jsonb_array_elements(c.config->'data_source_templates') AS e
+                    WHERE e->>'id' <> ALL($1)
+                )) WHERE c.id = $2
+                RETURNING c.config->>'data_source_templates' AS data_source_templates`,
+            values: [templateIDs, containerID]
+        };
+    }
+
+    private authorizeDataSourceTemplateStatement(templateName: string, containerID: string): QueryConfig {
+        return {
+            text: `UPDATE containers AS c SET
+                config = jsonb_set(config, '{data_source_templates}', (
+                    SELECT jsonb_agg(
+                        CASE
+                            WHEN e->>'name' = $1 THEN jsonb_set(e, '{authorized}', 'true'::jsonb)
+                            ELSE e
+                        END
+                    ) FROM jsonb_array_elements(c.config->'data_source_templates') AS e
+                )) WHERE c.id = $2
+                RETURNING c.config->>'data_source_templates' AS data_source_templates`,
+            values: [templateName, containerID]
+        }
+    }
 }
diff --git a/src/data_access_layer/migrations/072_transformation_merge.sql b/src/data_access_layer/migrations/072_transformation_merge.sql
new file mode 100644
index 000000000..c8a4210ca
--- /dev/null
+++ b/src/data_access_layer/migrations/072_transformation_merge.sql
@@ -0,0 +1 @@
+ALTER TABLE type_mapping_transformations ADD column merge bool;
\ No newline at end of file
diff --git a/src/data_access_layer/migrations/073_node_trigger_update.sql b/src/data_access_layer/migrations/073_node_trigger_update.sql
new file mode 100644
index 000000000..d06708143
--- /dev/null
+++ b/src/data_access_layer/migrations/073_node_trigger_update.sql
@@ -0,0 +1,44 @@
+DROP TRIGGER IF EXISTS node_insert_trigger ON nodes;
+
+/*
+the node insert trigger now accounts for metadata_properties
+and ensures the correct old node will be returned based on created_at
+ */
+CREATE OR REPLACE FUNCTION node_insert_trigger() RETURNS TRIGGER AS $$
+DECLARE
+    old_id bigint;
+    old_properties jsonb;
+    old_metadata_properties jsonb;
+BEGIN
+    IF NEW.original_data_id IS NOT NULL THEN
+        BEGIN
+            SELECT nodes.id, nodes.properties, nodes.metadata_properties
+            INTO old_id, old_properties, old_metadata_properties
+            FROM nodes
+            WHERE original_data_id = NEW.original_data_id
+              AND metatype_id = NEW.metatype_id
+              AND data_source_id = NEW.data_source_id
+              AND created_at <= NEW.created_at::TIMESTAMP
+            ORDER BY nodes.created_at DESC LIMIT 1;
+        EXCEPTION
+            WHEN NO_DATA_FOUND THEN
+                old_id := NULL;
+        END;
+
+        IF old_id IS NOT NULL THEN
+            NEW.id = old_id;
+/*
+ if the old properties and metadata properties are exactly the same as the incoming, silently discard the insert
+ */
+            IF old_properties IS NOT DISTINCT FROM NEW.properties AND old_metadata_properties IS NOT DISTINCT FROM NEW.metadata_properties THEN
+                RETURN NULL;
+            END IF;
+        END IF;
+    END IF;
+
+    RETURN NEW;
+END;
+$$ language plpgsql;
+
+CREATE TRIGGER node_insert_trigger BEFORE INSERT ON nodes
+    FOR EACH ROW EXECUTE PROCEDURE node_insert_trigger();
\ No newline at end of file
diff --git a/src/data_access_layer/repositories/access_management/keypair_repository.ts b/src/data_access_layer/repositories/access_management/keypair_repository.ts
index 0dfba48bb..52401eab3 100644
--- a/src/data_access_layer/repositories/access_management/keypair_repository.ts
+++ b/src/data_access_layer/repositories/access_management/keypair_repository.ts
@@ -3,6 +3,8 @@ import bcrypt from 'bcryptjs';
 import RepositoryInterface from '../repository';
 import { KeyPair, User } from '../../../domain_objects/access_management/user';
 import Result from '../../../common_classes/result';
+import ContainerRepository from '../data_warehouse/ontology/container_respository';
+import Logger from '../../../services/logger';
 
 /*
  KeyPairRepository is an extremely simple repository as keys should normally be added and
@@ -28,9 +30,8 @@ export default class KeyPairRepository implements RepositoryInterface<KeyPair> {
         return this.#mapper.Retrieve(key);
     }
 
-    async save(t: KeyPair, user: User): Promise<Result<boolean>> {
-        // if we have the secret already set, assume we're dealing with a created
-        // keypair
+    async save(t: KeyPair, user: User, containerID?: string): Promise<Result<boolean>> {
+        // if we have the secret already set, assume we're dealing with a created keypair
         if (t.secret) return Promise.resolve(Result.Success(true));
 
         const errors = await t.validationErrors();
@@ -48,6 +49,28 @@ export default class KeyPairRepository implements RepositoryInterface<KeyPair> {
 
         Object.assign(t, created.value);
 
+        // check service user keypair notes for 'x_adapter_auth' and mark appropriate template as authorized
+        // this will eventually be removed in favor of data source messgaes to confirm authorization
+        if (
+            user.identity_provider === 'service'
+            && containerID
+            && t.note
+            && t.note.endsWith('_adapter_auth')
+        ) {
+            const containerRepo = new ContainerRepository();
+
+            // slice off "_adapter_auth" and check if there is an adapter of a matching name to be marked as authorized
+            const templatelName = t.note.slice(0, -('_adapter_auth'.length)).toLowerCase();
+            const authorized = await containerRepo.authorizeDataSourceTemplate(templatelName, containerID);
+
+            // if there is an error, log it and move on but do not return a failure
+            if (authorized.isError) {
+                Logger.error(`unable to mark ${templatelName} as authorized for container ${containerID}: ${authorized.error?.error}`);
+            } else if (authorized.value) {
+                Logger.info(`data source template ${templatelName} has been authorized to access container ${containerID}`);
+            }
+        }
+
         return Promise.resolve(Result.Success(true));
     }
 }
diff --git a/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts b/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
index b6da58a99..65fa65c10 100644
--- a/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/data/node_repository.ts
@@ -75,7 +75,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
         return Promise.resolve(node);
     }
 
-    async save(n: Node, user: User, transaction?: PoolClient): Promise<Result<boolean>> {
+    async save(n: Node, user: User, transaction?: PoolClient, merge = false): Promise<Result<boolean>> {
         let internalTransaction = false;
         const errors = await n.validationErrors();
         if (errors) return Promise.resolve(Result.Failure(`node does not pass validation ${errors.join(',')}`));
@@ -117,7 +117,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
 
             Object.assign(original.value, n);
 
-            const results = await this.#mapper.Update(user.id!, original.value);
+            const results = await this.#mapper.Update(user.id!, original.value, undefined, merge);
             if (results.isError) {
                 if (internalTransaction) await this.#mapper.rollbackTransaction(transaction);
                 return Promise.resolve(Result.Pass(results));
@@ -127,7 +127,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
                 Object.assign(n, results.value);
             }
         } else {
-            const results = await this.#mapper.CreateOrUpdateByCompositeID(user.id!, n);
+            const results = await this.#mapper.CreateOrUpdateByCompositeID(user.id!, n, undefined, merge);
             if (results.isError) {
                 if (internalTransaction) await this.#mapper.rollbackTransaction(transaction);
                 return Promise.resolve(Result.Pass(results));
@@ -146,7 +146,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
         return Promise.resolve(Result.Success(true));
     }
 
-    async bulkSave(user: User | string, nodes: Node[], transaction?: PoolClient): Promise<Result<boolean>> {
+    async bulkSave(user: User | string, nodes: Node[], transaction?: PoolClient, merge = false): Promise<Result<boolean>> {
         let internalTransaction = false;
         if (!transaction) {
             const newTransaction = await this.#mapper.startTransaction();
@@ -220,7 +220,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
         }
 
         if (toUpdate.length > 0) {
-            const saved = await this.#mapper.BulkUpdate(user instanceof User ? user.id! : user, toUpdate, transaction);
+            const saved = await this.#mapper.BulkUpdate(user instanceof User ? user.id! : user, toUpdate, merge, transaction);
             if (saved.isError) {
                 if (internalTransaction) await this.#mapper.rollbackTransaction(transaction);
                 return Promise.resolve(Result.Pass(saved));
@@ -230,7 +230,7 @@ export default class NodeRepository extends Repository implements RepositoryInte
         }
 
         if (toCreate.length > 0) {
-            const saved = await this.#mapper.BulkCreateOrUpdateByCompositeID(user instanceof User ? user.id! : user, toCreate, transaction);
+            const saved = await this.#mapper.BulkCreateOrUpdateByCompositeID(user instanceof User ? user.id! : user, toCreate, transaction, merge);
             if (saved.isError) {
                 if (internalTransaction) await this.#mapper.rollbackTransaction(transaction);
                 return Promise.resolve(Result.Pass(saved));
diff --git a/src/data_access_layer/repositories/data_warehouse/etl/type_mapping_repository.ts b/src/data_access_layer/repositories/data_warehouse/etl/type_mapping_repository.ts
index eff48e99a..32a485cc9 100644
--- a/src/data_access_layer/repositories/data_warehouse/etl/type_mapping_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/etl/type_mapping_repository.ts
@@ -354,12 +354,13 @@ export default class TypeMappingRepository extends Repository implements Reposit
                         // ids and key ids if all that are present are the names - note that this will not modify the mapping if
                         // the transformation and keys already have id's present, allows us to skip any checks prior to attempting
                         // the function
-                        if (mapping.transformations)
+                        if (mapping.transformations) {
                             await this.#transformationRepo.backfillIDs(
                                 targetDataSource.value.container_id!,
                                 targetDataSource.value.id!,
                                 ...mapping.transformations,
                             );
+                        }
 
                         // now we can save the newly modified mapping
                         const saved = await this.save(mapping, user, true);
@@ -398,11 +399,13 @@ export default class TypeMappingRepository extends Repository implements Reposit
     // import - it will wipe out all existing ID fields, and will fill the metatype/relationship key names so that they
     // can be imported into a separate container or instance later on. We would include this on the domain object, were
     // it not for the populateKeys call that needs to be made to back-fill information from the database
-    async prepareForImport(typeMapping: TypeMapping, source: DataSourceRecord, separateContainer = true): Promise<TypeMapping> {
-        typeMapping.shape_hash = TypeMapping.objectToShapeHash(typeMapping.sample_payload, {
-            stop_nodes: source.config?.stop_nodes,
-            value_nodes: source.config?.value_nodes,
-        });
+    async prepareForImport(typeMapping: TypeMapping, source?: DataSourceRecord, separateContainer = true): Promise<TypeMapping> {
+        if (source) {
+            typeMapping.shape_hash = TypeMapping.objectToShapeHash(typeMapping.sample_payload, {
+                stop_nodes: source.config?.stop_nodes,
+                value_nodes: source.config?.value_nodes,
+            });
+        }
         // run transformation work prior to manipulating any data on the mapping itself
         if (typeMapping.transformations) {
             for (const i in typeMapping.transformations) {
diff --git a/src/data_access_layer/repositories/data_warehouse/import/data_source_repository.ts b/src/data_access_layer/repositories/data_warehouse/import/data_source_repository.ts
index 578cb0fe1..b5828f880 100644
--- a/src/data_access_layer/repositories/data_warehouse/import/data_source_repository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/import/data_source_repository.ts
@@ -14,7 +14,7 @@ import ImportRepository from './import_repository';
 import TimeseriesDataSourceImpl from '../../../../interfaces_and_impl/data_warehouse/import/timeseries_data_source';
 import File from '../../../../domain_objects/data_warehouse/data/file';
 import {plainToClass} from 'class-transformer';
-import TimeseriesService from '../../../../services/timeseries/timeseries';
+import CustomDataSourceImpl from '../../../../interfaces_and_impl/data_warehouse/import/custom_data_source';
 import DataStagingMapper from '../../../mappers/data_warehouse/import/data_staging_mapper';
 
 /*
@@ -31,7 +31,6 @@ export default class DataSourceRepository extends Repository implements Reposito
     #importRepo = new ImportRepository();
     #factory = new DataSourceFactory();
     #groupBy?: string[];
-    #timeseriesBucket = TimeseriesService.GetInstance;
 
     async delete(t: DataSource, options?: DeleteOptions): Promise<Result<boolean>> {
         if (!t.DataSourceRecord || !t.DataSourceRecord.id)
@@ -305,15 +304,6 @@ export default class DataSourceRepository extends Repository implements Reposito
         return this;
     }
 
-    inactive() {
-        super.query('active', 'eq', false);
-        return this;
-    }
-
-    timeseriesQuery(fieldName: string, operator: string, value?: any, dataType?: string): Repository {
-        return super.query(`"${fieldName}"`, operator, value, {dataType});
-    }
-
     async list(options?: QueryOptions, transaction?: PoolClient): Promise<Result<(DataSource | undefined)[]>> {
         const results = await super.findAll<DataSourceRecord>(options, {
             transaction,
@@ -400,12 +390,19 @@ export default class DataSourceRepository extends Repository implements Reposito
 }
 
 // as part of the data source repository we also include the Data Source factory, used
-// to take data source records and generate data source interfaces from them. Currently
-// the only implementations are the Http and Standard data sources.
+// to take data source records and generate data source interfaces from them.
 export class DataSourceFactory {
     async fromDataSourceRecord(
-        sourceRecord: DataSourceRecord,
-    ): Promise<StandardDataSourceImpl | HttpDataSourceImpl | AvevaDataSourceImpl | TimeseriesDataSourceImpl | P6DataSourceImpl | undefined> {
+        sourceRecord: DataSourceRecord
+    ): Promise<
+        | StandardDataSourceImpl
+        | HttpDataSourceImpl
+        | AvevaDataSourceImpl
+        | TimeseriesDataSourceImpl
+        | P6DataSourceImpl
+        | CustomDataSourceImpl
+        | undefined
+        > {
         switch (sourceRecord.adapter_type) {
             case 'http': {
                 return Promise.resolve(new HttpDataSourceImpl(sourceRecord));
@@ -428,6 +425,10 @@ export class DataSourceFactory {
                 return Promise.resolve(new P6DataSourceImpl(sourceRecord));
             }
 
+            case 'custom': {
+                return Promise.resolve(new CustomDataSourceImpl(sourceRecord));
+            }
+
             case 'timeseries': {
                 return Promise.resolve(new TimeseriesDataSourceImpl(sourceRecord));
             }
diff --git a/src/data_access_layer/repositories/data_warehouse/ontology/container_respository.ts b/src/data_access_layer/repositories/data_warehouse/ontology/container_respository.ts
index 30f1f4d8d..5fc107ad8 100644
--- a/src/data_access_layer/repositories/data_warehouse/ontology/container_respository.ts
+++ b/src/data_access_layer/repositories/data_warehouse/ontology/container_respository.ts
@@ -1,5 +1,9 @@
 import RepositoryInterface from '../../repository';
-import Container, {ContainerAlert, ContainerExport} from '../../../../domain_objects/data_warehouse/ontology/container';
+import Container, {
+    ContainerAlert,
+    ContainerExport,
+    DataSourceTemplate
+} from '../../../../domain_objects/data_warehouse/ontology/container';
 import Result from '../../../../common_classes/result';
 import ContainerMapper from '../../../mappers/data_warehouse/ontology/container_mapper';
 import Authorization from '../../../../domain_objects/access_management/authorization/authorization';
@@ -30,8 +34,9 @@ import MetatypeRelationshipKeyRepository from './metatype_relationship_key_repos
 import MetatypeRelationshipPairRepository from './metatype_relationship_pair_repository';
 import MetatypeRelationshipPair from '../../../../domain_objects/data_warehouse/ontology/metatype_relationship_pair';
 import TypeMappingRepository from '../etl/type_mapping_repository';
-import KeyPairMapper from '../../../mappers/access_management/keypair_mapper';
-import RedisGraphLoaderService from '../../../../services/cache/redis_graph_loader';
+import RedisGraphService from '../../../../services/cache/redis_graph_loader';
+import NodeRSA from 'node-rsa';
+import {v4 as uuidv4} from 'uuid';
 
 /*
     ContainerRepository contains methods for persisting and retrieving a container
@@ -49,6 +54,15 @@ export default class ContainerRepository implements RepositoryInterface<Containe
             return Promise.resolve(Result.Failure(`container does not pass validation ${errors.join(',')}`));
         }
 
+        // iterate through any data source templates and encrypt them
+        if (c.config?.data_source_templates && c.config.data_source_templates?.length > 0) {
+            const templates = c.config.data_source_templates;
+            for (const template of templates) {
+                const index = templates.indexOf(template);
+                templates[index] = await this.encryptTemplate(template);
+            }
+        }
+
         // if we have a set ID, attempt to update the Container
         if (c.id) {
             // to allow partial updates we must first fetch the original object
@@ -97,6 +111,15 @@ export default class ContainerRepository implements RepositoryInterface<Containe
                 return Promise.resolve(Result.Failure(`some containers do not pass validation ${errors.join(',')}`));
             }
 
+            // iterate through any data source templates and encrypt them
+            if (container.config?.data_source_templates && container.config.data_source_templates?.length > 0) {
+                const templates = container.config.data_source_templates;
+                for (const template of templates) {
+                    const index = templates.indexOf(template);
+                    templates[index] = await this.encryptTemplate(template);
+                }
+            }
+
             if (container.id) {
                 toUpdate.push(container);
                 void this.deleteCached(container.id);
@@ -239,16 +262,15 @@ export default class ContainerRepository implements RepositoryInterface<Containe
         return Promise.resolve(retrieved);
     }
 
-    async loadIntoRedis(id: string): Promise<Result<boolean>> {
-        const loader = await RedisGraphLoaderService.GetInstance();
+    async loadIntoRedis(id: string): Promise<Result<string>> {
+        const loader = await RedisGraphService.GetInstance();
 
         try {
-            await loader.loadGraph(id);
+            const key = await loader.loadGraph(id);
+            return Promise.resolve(Result.Success(key));
         } catch (e: any) {
             return Promise.resolve(Result.Failure(e.toString()));
         }
-
-        return Promise.resolve(Result.Success(true));
     }
 
     async createAlert(alert: ContainerAlert, user?: User): Promise<Result<boolean>> {
@@ -500,6 +522,191 @@ export default class ContainerRepository implements RepositoryInterface<Containe
         }
     }
 
+    async saveDataSourceTemplate(t: DataSourceTemplate, containerID: string): Promise<Result<boolean>> {
+        const errors = await t.validationErrors();
+        if (errors) {
+            return Promise.resolve(Result.Failure(`data source template does not pass validation ${errors.join(',')}`));
+        }
+
+        // remove cached version of container since we are making a change to it
+        void this.deleteCached(containerID);
+
+        // if there is an existing template that matches ID or name, update
+        const matchedByID = (await this.findDataSourceTemplateByID(t.id!, containerID)).value;
+        const matchedByName = (await this.findDataSourceTemplateByName(t.name!, containerID)).value;
+
+        t = await this.encryptTemplate(t);
+
+        if (matchedByID) {
+            Object.assign(matchedByID, t);
+
+            const updated = await this.#mapper.UpdateDataSourceTemplate(matchedByID, containerID);
+            if (updated.isError) return Promise.resolve(Result.Pass(updated));
+
+            Object.assign(t, updated.value);
+            return Promise.resolve(Result.Success(true));
+        } else if (matchedByName) {
+            // override the "new" ID with the one from the fetched template
+            t.id = matchedByName.id;
+            Object.assign(matchedByName, t);
+
+            const updated = await this.#mapper.UpdateDataSourceTemplate(matchedByName, containerID);
+            if (updated.isError) return Promise.resolve(Result.Pass(updated));
+
+            Object.assign(t, updated.value);
+            return Promise.resolve(Result.Success(true));
+        }
+
+        // if the container has no matching templates, create a new one
+        const created = await this.#mapper.CreateDataSourceTemplate(t, containerID);
+        if (created.isError) return Promise.resolve(Result.Pass(created));
+
+        // set the original object to the returned one
+        Object.assign(t, created.value);
+
+        return Promise.resolve(Result.Success(true));
+    }
+
+    async bulkSaveDataSourceTemplates(t: DataSourceTemplate[], containerID: string): Promise<Result<boolean>> {
+        // separate data source templates by which need to be created vs updated
+        const toCreate: DataSourceTemplate[] = [];
+        const toUpdate: DataSourceTemplate[] = [];
+        const toReturn: DataSourceTemplate[] = [];
+
+        // create storage object for existing template lookup. we can't
+        // simply search on the existence of ID or name since even new
+        // objects will be coming through with both IDs and names.
+        const existingTemplatesByID: {[id: string]: DataSourceTemplate} = {};
+        const existingTemplatesByName: {[name: string]: DataSourceTemplate} = {};
+
+        const existingTemplates = await this.#mapper.ListDataSourceTemplates(containerID);
+        if (existingTemplates.isError) {
+            return Promise.resolve(Result.Failure(`could not list data source templates for container ${containerID}`));
+        }
+
+        existingTemplates.value?.forEach(template => {
+            existingTemplatesByID[template.id!] = template;
+            existingTemplatesByName[template.name!] = template;
+        });
+
+        // run validation and separate
+        for (let template of t) {
+            const errors = await template.validationErrors();
+            if (errors) {
+                return Promise.resolve(Result.Failure(`some data source templates do not pass validation ${errors.join(',')}`));
+            }
+
+            template = await this.encryptTemplate(template);
+
+            if (existingTemplatesByID[template.id!] !== undefined) {
+                toUpdate.push(template);
+            } else if (existingTemplatesByName[template.name!] !== undefined) {
+                // override the "new" ID with the ID of the fetched template
+                template.id = existingTemplatesByName[template.name!].id!
+                toUpdate.push(template);
+            } else {
+                // if no ID is supplied, generate a new one before creation
+                template.id = template.id ? template.id : uuidv4();
+                toCreate.push(template);
+            }
+        }
+
+        // we run bulk save in a transaction so that on failure
+        // we don't get stuck with partially updated items
+        const transaction = await this.#mapper.startTransaction();
+        if (transaction.isError) return Promise.resolve(Result.Failure(`unable to initiate db transaction`));
+
+        // remove cached version of container since we are making a change to it
+        void this.deleteCached(containerID);
+
+        if (toUpdate.length > 0) {
+            // instead of doing a bulk update within a single query, which requires using
+            // a complex CTE, perform a bulk delete of all relevant templates followed by
+            // a bulk insert of the new templates, all within the safety of a transaction.
+            const toDelete = toUpdate.map(t => t.id!);
+            const deleted = await this.#mapper.BulkDeleteDataSourceTemplates(toDelete, containerID, transaction.value);
+            if (deleted.isError) {
+                await this.#mapper.rollbackTransaction(transaction.value);
+                return Promise.resolve(Result.Pass(deleted));
+            }
+
+            const created = await this.#mapper.BulkCreateDataSourceTemplates(toUpdate, containerID, transaction.value);
+            if (created.isError) {
+                await this.#mapper.rollbackTransaction(transaction.value);
+                return Promise.resolve(Result.Pass(created));
+            }
+
+            toReturn.push(...created.value);
+        }
+
+        if (toCreate.length > 0) {
+            const created = await this.#mapper.BulkCreateDataSourceTemplates(toCreate, containerID, transaction.value);
+            if (created.isError) {
+                await this.#mapper.rollbackTransaction(transaction.value);
+                return Promise.resolve(Result.Pass(created));
+            }
+
+            toReturn.push(...created.value);
+        }
+
+        const committed = await this.#mapper.completeTransaction(transaction.value);
+        if (committed.isError) {
+            await this.#mapper.rollbackTransaction(transaction.value);
+            return Promise.resolve(Result.Failure(`unable to commit changes to db ${committed.error}`));
+        }
+
+        toReturn.forEach((result, i) => {
+            Object.assign(t[i], result);
+        });
+
+        return Promise.resolve(Result.Success(true));
+    }
+
+    async listDataSourceTemplates(containerID: string): Promise<Result<DataSourceTemplate[]>> {
+        const templates = await this.#mapper.ListDataSourceTemplates(containerID);
+        if (templates.isError) return Promise.resolve(Result.Pass(templates));
+        // in the event that data source templates are null, return an empty array
+        if (templates.value === null) templates.value = [];
+        return Promise.resolve(templates);
+    }
+
+    async findDataSourceTemplateByID(templateID: string, containerID: string): Promise<Result<DataSourceTemplate>> {
+        const retrieved = await this.#mapper.RetrieveDataSourceTemplateByID(templateID, containerID);
+        if (retrieved.isError) return Promise.resolve(Result.Pass(retrieved));
+        const toReturn = retrieved.value;
+        return Promise.resolve(Result.Success(toReturn));
+    }
+
+    async findDataSourceTemplateByName(templateName: string, containerID: string): Promise<Result<DataSourceTemplate>> {
+        const retrieved = await this.#mapper.RetrieveDataSourceTemplateByName(templateName, containerID);
+        if (retrieved.isError) return Promise.resolve(Result.Pass(retrieved));
+        const toReturn = retrieved.value;
+        return Promise.resolve(Result.Success(toReturn));
+    }
+
+    async bulkDeleteDataSourceTemplates(templateIDs: string[], containerID: string): Promise<Result<boolean>> {
+        const deleted = await this.#mapper.BulkDeleteDataSourceTemplates(templateIDs, containerID);
+        if (deleted.isError) return Promise.resolve(Result.Pass(deleted));
+        return Promise.resolve(Result.Success(true));
+    }
+
+    // this method accepts an `adapter_auth` note from the KeyPair repository and marks the
+    // adapter with a matching name as authorized. This is to help track whether the adapter
+    // has been authorized to poll the container so the user doesn't have to keep re-authorizing
+    // the adapter for use like they did previously.
+    // TODO: Replace this with data source messaging system eventually
+    async authorizeDataSourceTemplate(adapterName: string, containerID: string): Promise<Result<boolean>> {
+        const templates = await this.listDataSourceTemplates(containerID);
+        for (const template of templates.value) {
+            if (template.name?.toLowerCase() === adapterName) {
+                const authorized = await this.#mapper.AuthorizeDataSourceTemplate(template.name, containerID);
+                if (authorized.isError) return Promise.resolve(Result.Pass(authorized));
+                return Promise.resolve(Result.Success(true));
+            }
+        }
+        return Promise.resolve(Result.Success(false));
+    }
+
     private async getCached(id: string): Promise<Container | undefined> {
         const cached = await Cache.get<object>(`${ContainerMapper.tableName}:${id}`);
         if (cached) {
@@ -523,4 +730,20 @@ export default class ContainerRepository implements RepositoryInterface<Containe
 
         return Promise.resolve(deleted);
     }
+
+    private async encryptTemplate(template: DataSourceTemplate): Promise<DataSourceTemplate> {
+        const key = new NodeRSA(Config.encryption_key_secret);
+
+        const output = plainToClass(DataSourceTemplate, {...template});
+
+        if (output.custom_fields) {
+            for (const field of output.custom_fields) {
+                if (field.encrypt === true && field.value !== undefined) {
+                    field.value = key.encryptPrivate(field.value, 'base64');
+                }
+            }
+        }
+
+        return Promise.resolve(output);
+    }
 }
diff --git a/src/data_processing/process.ts b/src/data_processing/process.ts
index 83c087a10..53696f7c5 100644
--- a/src/data_processing/process.ts
+++ b/src/data_processing/process.ts
@@ -91,7 +91,9 @@ export async function ProcessData(staging: DataStaging): Promise<Result<boolean>
         }
     }
 
-    let nodesToInsert: Node[] = [];
+    let nodesToInsert: Node[] = []; // holds all nodes to insert
+    let nodesToMerge: Node[] = []; // holds node to be inserted via merge
+    let nodesToOverwrite: Node[] = []; // holds nodes to be inserted via overwrite
     const tagsToAttachNodes: NodeTagAttachment[] = [];
     let edgesToQueue: EdgeQueueItem[] = [];
 
@@ -125,6 +127,11 @@ export async function ProcessData(staging: DataStaging): Promise<Result<boolean>
                             return result.original_data_id!;
                         }),
                     });
+                if (transformation.merge) {
+                    nodesToMerge.push(...results.value);
+                } else {
+                    nodesToOverwrite.push(...results.value);
+                }
             }
 
             if (IsEdges(results.value)) {
@@ -149,15 +156,30 @@ export async function ProcessData(staging: DataStaging): Promise<Result<boolean>
     // duplicates because even if we inserted them they'd be overwritten, or overwrite, the original. Users should be made
     // aware that if their import is generating records with the same original ID only one instance is going to be inserted
     nodesToInsert = nodesToInsert.filter((value, index, self) => index === self.findIndex((t) => t.original_data_id === value.original_data_id));
+    nodesToMerge = nodesToMerge.filter((value, index, self) => index === self.findIndex((t) => t.original_data_id === value.original_data_id));
+    nodesToOverwrite = nodesToOverwrite.filter((value, index, self) => index === self.findIndex((t) => t.original_data_id === value.original_data_id));
 
     // insert all nodes and files
     if (nodesToInsert.length > 0) {
-        const inserted = await nodeRepository.bulkSave(staging.data_source_id!, nodesToInsert, transaction.value);
-        if (inserted.isError) {
-            await stagingMapper.rollbackTransaction(transaction.value);
+        // insert nodes grouped by merge/overwrite
+        if (nodesToMerge.length > 0) {
+            const inserted = await nodeRepository.bulkSave(staging.data_source_id!, nodesToMerge, transaction.value, true);
+            if (inserted.isError) {
+                await stagingMapper.rollbackTransaction(transaction.value);
+
+                await stagingRepo.setErrors(staging.id!, [`error attempting to insert nodes ${inserted.error?.error}`]);
+                return new Promise((resolve) => resolve(Result.DebugFailure(`error attempting to insert nodes ${inserted.error?.error}`)));
+            }
+        }
 
-            await stagingRepo.setErrors(staging.id!, [`error attempting to insert nodes ${inserted.error?.error}`]);
-            return new Promise((resolve) => resolve(Result.DebugFailure(`error attempting to insert nodes ${inserted.error?.error}`)));
+        if (nodesToOverwrite.length > 0) {
+            const inserted = await nodeRepository.bulkSave(staging.data_source_id!, nodesToOverwrite, transaction.value, false);
+            if (inserted.isError) {
+                await stagingMapper.rollbackTransaction(transaction.value);
+
+                await stagingRepo.setErrors(staging.id!, [`error attempting to insert nodes ${inserted.error?.error}`]);
+                return new Promise((resolve) => resolve(Result.DebugFailure(`error attempting to insert nodes ${inserted.error?.error}`)));
+            }
         }
 
         // now that the nodes are inserted, attempt to attach any files from their original staging records
diff --git a/src/domain_objects/data_warehouse/etl/type_transformation.ts b/src/domain_objects/data_warehouse/etl/type_transformation.ts
index 9fa8580d1..843aba04a 100644
--- a/src/domain_objects/data_warehouse/etl/type_transformation.ts
+++ b/src/domain_objects/data_warehouse/etl/type_transformation.ts
@@ -331,6 +331,9 @@ export default class TypeTransformation extends BaseDomainClass {
     @Type(() => MappingTag)
     tags: MappingTag[] = [];
 
+    @IsOptional()
+    merge?: boolean;
+
     @IsOptional()
     transaction?: PoolClient;
 
@@ -358,6 +361,7 @@ export default class TypeTransformation extends BaseDomainClass {
         tags?: MappingTag[];
         origin_parameters?: EdgeConnectionParameter[];
         destination_parameters?: EdgeConnectionParameter[];
+        merge?: boolean;
     }) {
         super();
 
@@ -385,6 +389,7 @@ export default class TypeTransformation extends BaseDomainClass {
             if (input.tags) this.tags = input.tags;
             if (input.destination_parameters) this.destination_parameters = input.destination_parameters;
             if (input.origin_parameters) this.origin_parameters = input.origin_parameters;
+            if (input.merge) this.merge = input.merge;
         }
     }
 
diff --git a/src/domain_objects/data_warehouse/import/data_source.ts b/src/domain_objects/data_warehouse/import/data_source.ts
index ad215b619..fb2b088f0 100644
--- a/src/domain_objects/data_warehouse/import/data_source.ts
+++ b/src/domain_objects/data_warehouse/import/data_source.ts
@@ -1,6 +1,5 @@
 import {BaseDomainClass, NakedDomainClass} from '../../../common_classes/base_domain_class';
 import {
-    ArrayMinSize,
     IsArray,
     IsBoolean,
     IsDefined,
@@ -16,13 +15,14 @@ import {
     ValidationOptions,
     registerDecorator,
     ValidationArguments,
-    IsNotEmpty,
+    IsNotEmpty
 } from 'class-validator';
 import {Exclude, Type} from 'class-transformer';
 import {PoolClient} from 'pg';
-import {Transform} from 'stream';
+import { Transform as TransformStream } from 'stream';
 import {DataRetentionDays} from '../../validators/data_retention_validator';
 import {WebSocket} from 'ws';
+import { DataSourceTemplate } from '../ontology/container';
 
 // ReceiveDataOptions will allow us to grow the potential options needed by the ReceiveData
 // function of various implementations without having to grow the parameter list
@@ -30,7 +30,7 @@ export class ReceiveDataOptions {
     transaction?: PoolClient;
     importID?: string;
     overrideJsonStream? = false; // needed if you're passing raw json objects or an object stream
-    transformStream?: Transform; // streams to pipe to, prior to piping to the JSONStream
+    transformStream?: TransformStream; // streams to pipe to, prior to piping to the JSONStream
     bufferSize = 1000; // buffer size for timeseries records to be inserted into the db, modify this at runtime if needed
     websocket?: WebSocket;
     has_files?: boolean = false; // dictates that this piece of data has files attached
@@ -46,7 +46,15 @@ export class ReceiveDataOptions {
  validate against
 */
 export class BaseDataSourceConfig extends NakedDomainClass {
-    kind: 'http' | 'standard' | 'manual' | 'aveva' | 'timeseries' | 'p6' | 'timeseries_bucket' = 'standard';
+    kind: 'http'
+    | 'standard'
+    | 'manual'
+    | 'aveva'
+    | 'timeseries'
+    | 'p6'
+    | 'timeseries_bucket'
+    | 'custom'
+    | 'test' = 'standard';
 
     // advanced configuration, while we allow the user to set these it's generally
     // assumed that only those with technical knowledge or experience would be modifying
@@ -198,7 +206,7 @@ export class AvevaDataSourceConfig extends BaseDataSourceConfig {
         'NXRUSION',
     ];
 
-    // element types for which IFC files hould be generated - these are sane defaults and should cover most use cases
+    // element types for which IFC files should be generated - these are sane defaults and should cover most use cases
     // as it will return the whole project as an ifc file, then separate by zones, sites etc. See Aveva's database documentation
     // for more information - https://help.aveva.com/AVEVA_Everything3D/1.1/NCUG/wwhelp/wwhimpl/js/html/wwhelp.htm#href=NCUG4.5.15.html#1021602
     @IsArray()
@@ -341,6 +349,25 @@ export class TimeseriesDataSourceConfig extends BaseDataSourceConfig {
     }
 }
 
+// the simplest config object yet- all the fields for the config are stored
+// within the template object itself.
+export class CustomDataSourceConfig extends BaseDataSourceConfig {
+    kind: 'custom' = 'custom';
+
+    @Type(() => DataSourceTemplate)
+    @ValidateNested({each: true})
+    template?: DataSourceTemplate
+
+    constructor(input?: {
+        template?: DataSourceTemplate;
+    }) {
+        super();
+        if (input) {
+            if (input.template) this.template = input.template;
+        }
+    }
+}
+
 /*
     DataSourceRecord represents a data source record in the DeepLynx database and the various
     validations required for said record to be considered valid.
@@ -356,7 +383,7 @@ export default class DataSourceRecord extends BaseDomainClass {
     name?: string;
 
     @IsString()
-    @IsIn(['http', 'standard', 'manual', 'aveva', 'timeseries', 'p6', 'timeseries_bucket'])
+    @IsIn(['http', 'standard', 'manual', 'aveva', 'timeseries', 'p6', 'timeseries_bucket', 'custom'])
     adapter_type = 'standard';
 
     @IsString()
@@ -381,26 +408,38 @@ export default class DataSourceRecord extends BaseDomainClass {
     @Type(() => BaseDataSourceConfig, {
         keepDiscriminatorProperty: true,
         discriminator: {
-            property: 'kind',
-            subTypes: [
-                {value: StandardDataSourceConfig, name: 'standard'},
-                {value: StandardDataSourceConfig, name: 'manual'},
-                {value: HttpDataSourceConfig, name: 'http'},
-                {value: AvevaDataSourceConfig, name: 'aveva'},
-                {value: TimeseriesDataSourceConfig, name: 'timeseries'},
-                {value: P6DataSourceConfig, name: 'p6'},
-            ],
+        property: 'kind',
+        subTypes: [
+        {value: StandardDataSourceConfig, name: 'standard'},
+        {value: StandardDataSourceConfig, name: 'manual'},
+        {value: HttpDataSourceConfig, name: 'http'},
+        {value: AvevaDataSourceConfig, name: 'aveva'},
+        {value: TimeseriesDataSourceConfig, name: 'timeseries'},
+        {value: P6DataSourceConfig, name: 'p6'},
+        {value: CustomDataSourceConfig, name: 'custom'}
+        ],
         },
-    })
-    config?: StandardDataSourceConfig | HttpDataSourceConfig | AvevaDataSourceConfig | TimeseriesDataSourceConfig | P6DataSourceConfig =
-        new StandardDataSourceConfig();
+        })
+    config?:
+    | StandardDataSourceConfig
+    | HttpDataSourceConfig
+    | AvevaDataSourceConfig
+    | TimeseriesDataSourceConfig
+    | P6DataSourceConfig
+    | CustomDataSourceConfig = new StandardDataSourceConfig();
 
     constructor(input: {
         container_id: string;
         name: string;
         adapter_type: string;
         active?: boolean;
-        config?: StandardDataSourceConfig | HttpDataSourceConfig | AvevaDataSourceConfig | TimeseriesDataSourceConfig | P6DataSourceConfig;
+        config?:
+        | StandardDataSourceConfig
+        | HttpDataSourceConfig
+        | AvevaDataSourceConfig
+        | TimeseriesDataSourceConfig
+        | P6DataSourceConfig
+        | CustomDataSourceConfig;
         data_format?: string;
         status?: 'ready' | 'polling' | 'error';
         status_message?: string;
@@ -495,4 +534,4 @@ export function PrimaryTimestampExists(validationOptions?: ValidationOptions) {
             },
         });
     };
-}
+}
\ No newline at end of file
diff --git a/src/domain_objects/data_warehouse/import/import.ts b/src/domain_objects/data_warehouse/import/import.ts
index 24411ad58..8ae94c009 100644
--- a/src/domain_objects/data_warehouse/import/import.ts
+++ b/src/domain_objects/data_warehouse/import/import.ts
@@ -1,7 +1,14 @@
 import {BaseDomainClass, NakedDomainClass} from '../../../common_classes/base_domain_class';
-import {IsDate, IsDefined, IsNumber, IsOptional, IsString, IsUUID} from 'class-validator';
+import {IsDate, IsDefined, IsNumber, IsOptional, IsString} from 'class-validator';
 import {Type} from 'class-transformer';
-import {AvevaDataSourceConfig, BaseDataSourceConfig, HttpDataSourceConfig, StandardDataSourceConfig, P6DataSourceConfig} from './data_source';
+import {
+    AvevaDataSourceConfig,
+    BaseDataSourceConfig,
+    HttpDataSourceConfig,
+    StandardDataSourceConfig,
+    P6DataSourceConfig,
+    CustomDataSourceConfig
+} from './data_source';
 
 /*
     Import represents an import record in the DeepLynx database and the various
@@ -102,10 +109,17 @@ export class DataStaging extends NakedDomainClass {
                 {value: HttpDataSourceConfig, name: 'http'},
                 {value: AvevaDataSourceConfig, name: 'aveva'},
                 {value: P6DataSourceConfig, name: 'p6'},
+                {value: CustomDataSourceConfig, name: 'custom'},
             ],
         },
     })
-    data_source_config?: StandardDataSourceConfig | HttpDataSourceConfig | AvevaDataSourceConfig | P6DataSourceConfig = new StandardDataSourceConfig();
+    data_source_config?:
+    StandardDataSourceConfig
+    | HttpDataSourceConfig
+    | AvevaDataSourceConfig
+    | P6DataSourceConfig
+    | CustomDataSourceConfig =
+    new StandardDataSourceConfig();
 
     constructor(input: {data_source_id: string; import_id: string; data: any; shape_hash?: string; container_id?: string; file_attached?: boolean}) {
         super();
diff --git a/src/domain_objects/data_warehouse/ontology/container.ts b/src/domain_objects/data_warehouse/ontology/container.ts
index ddc120c79..d4ecb39f3 100644
--- a/src/domain_objects/data_warehouse/ontology/container.ts
+++ b/src/domain_objects/data_warehouse/ontology/container.ts
@@ -1,17 +1,32 @@
 /* eslint-disable @typescript-eslint/ban-types */
 import {BaseDomainClass, NakedDomainClass} from '../../../common_classes/base_domain_class';
-import {ArrayContains, IsArray, IsBoolean, IsDate, IsIn, IsNotEmpty, IsNumber, IsOptional, IsString, MinLength, ValidateNested} from 'class-validator';
+import {
+    IsArray,
+    IsBoolean,
+    IsDate,
+    IsIn,
+    IsNotEmpty,
+    IsNumber,
+    IsOptional,
+    IsString,
+    IsUUID,
+    MinLength,
+    registerDecorator,
+    ValidateNested,
+    ValidationOptions
+} from 'class-validator';
 import Result from '../../../common_classes/result';
 import Authorization from '../../access_management/authorization/authorization';
 import Logger from '../../../services/logger';
-import {Type} from 'class-transformer';
+import {Exclude, Type} from 'class-transformer';
 import Metatype from './metatype';
 import MetatypeRelationship from './metatype_relationship';
 import MetatypeKey from './metatype_key';
 import MetatypeRelationshipKey from './metatype_relationship_key';
 import MetatypeRelationshipPair from './metatype_relationship_pair';
-import {DataSource} from '../../../interfaces_and_impl/data_warehouse/import/data_source';
 import TypeMapping from '../etl/type_mapping';
+import {v4 as uuidv4} from 'uuid';
+import {DataSource} from "../../../interfaces_and_impl/data_warehouse/import/data_source";
 
 /*
     ContainerConfig allows the user and system to toggle features at a container
@@ -29,13 +44,22 @@ export class ContainerConfig extends NakedDomainClass {
     @IsOptional()
     enabled_data_sources?: string[] = [];
 
-    constructor(input?: {data_versioning_enabled: boolean; ontology_versioning_enabled?: boolean; enabled_data_sources?: string[]}) {
+    @IsOptional()
+    data_source_templates?: DataSourceTemplate[] = [];
+
+    constructor(input?: {
+        data_versioning_enabled: boolean;
+        ontology_versioning_enabled?: boolean;
+        enabled_data_sources?: string[];
+        data_source_templates?: DataSourceTemplate[];
+    }) {
         super();
 
         if (input) {
             this.ontology_versioning_enabled = input.ontology_versioning_enabled;
             this.data_versioning_enabled = input.data_versioning_enabled;
             if (input.enabled_data_sources) this.enabled_data_sources = input.enabled_data_sources;
+            if (input.data_source_templates) this.data_source_templates = input.data_source_templates;
         }
     }
 }
@@ -322,3 +346,122 @@ export class ContainerPermissionSet extends NakedDomainClass {
         return Promise.resolve(Result.Success(true));
     }
 }
+
+export class DataSourceTemplate extends NakedDomainClass{
+    @IsOptional()
+    @IsUUID()
+    id?: string;
+
+    @IsString()
+    name?: string;
+
+    @CustomFieldEncrypted()
+    @CustomFieldRequired()
+    @Type(() => CustomTemplateField)
+    @ValidateNested({each: true})
+    custom_fields?: CustomTemplateField[]
+
+    // "redirect_address" and "authorized" will be used for auth redirects to authorize the given adapter
+    // to access this container. These two fields may be removed later when a better adapter auth system is
+    // put into place, but we need to leave them here for the time being.
+    @IsOptional()
+    @IsString()
+    redirect_address?: string;
+
+    @IsBoolean()
+    authorized = false;
+
+    constructor(input?: {
+        id?: string;
+        name: string;
+        custom_fields?: CustomTemplateField[]
+        redirect_address?: string;
+    }) {
+        super();
+        if (input) {
+            this.id = input.id ? input.id : uuidv4();
+            this.name = input.name;
+            if (input.custom_fields) this.custom_fields = input.custom_fields;
+            if (input.redirect_address) this.redirect_address = input.redirect_address;
+        }
+    }
+}
+
+export function CustomFieldRequired(validationOptions?: ValidationOptions) {
+    return (object: Object, propertyName: string) => {
+        registerDecorator({
+            name: 'All required fields must have a value present',
+            target: object.constructor,
+            propertyName,
+            constraints: [],
+            options: validationOptions,
+            validator: {
+                validate(value: any) {
+                    const fields = value as CustomTemplateField[];
+
+                    // Skip validation if fields are not defined or empty
+                    if (!fields || fields.length === 0) return true;
+
+                    for (const field of fields) {
+                        if (field.required === true && field.value === undefined) {
+                            return false;
+                        }
+                    }
+
+                    return true;
+                }
+            }
+        })
+    }
+}
+
+export function CustomFieldEncrypted(validationOptions?: ValidationOptions) {
+    return (object: Object, propertyName: string) => {
+        registerDecorator({
+            name: 'All encrypted fields must be required and have a value present',
+            target: object.constructor,
+            propertyName,
+            constraints: [],
+            options: validationOptions,
+            validator: {
+                validate(value: any) {
+                    const fields = value as CustomTemplateField[];
+
+                    // Skip validation if fields are not defined or empty
+                    if (!fields || fields.length === 0) return true;
+
+                    for (const field of fields) { // fail validation if a field needs to be encrypted but is not required or unspecified
+                        if (field.encrypt === true && !field.required) {
+                            return false;
+                        }
+                    }
+
+                    return true;
+                }
+            }
+        })
+    }
+}
+
+export class CustomTemplateField {
+    name?: string;
+
+    @Exclude({ toPlainOnly: true })
+    value?: string;
+
+    encrypt?: boolean;
+
+    required?: boolean;
+
+    constructor(
+        name?: string,
+        value?: string,
+        encrypt?: boolean,
+        required?: boolean
+    ) {
+        this.name = name;
+        this.value = value;
+        this.encrypt = encrypt;
+        this.required = required;
+    }
+}
\ No newline at end of file
diff --git a/src/http_server/routes/access_management/user_routes.ts b/src/http_server/routes/access_management/user_routes.ts
index f91f922f3..fa2f14044 100644
--- a/src/http_server/routes/access_management/user_routes.ts
+++ b/src/http_server/routes/access_management/user_routes.ts
@@ -447,11 +447,11 @@ export default class UserRoutes {
 
     private static generateKeyPairForServiceUser(req: Request, res: Response, next: NextFunction) {
         const keyRepo = new KeyPairRepository();
-        if (req.serviceUser) {
+        if (req.serviceUser && req.container!.id) {
             const keyPair = new KeyPair(req.serviceUser.id, req.body.note);
 
             keyRepo
-                .save(keyPair, req.serviceUser)
+                .save(keyPair, req.serviceUser, req.container!.id)
                 .then((result) => {
                     if (result.isError) {
                         res.status(500);
@@ -470,7 +470,7 @@ export default class UserRoutes {
 
     private static listKeyPairsForServiceUser(req: Request, res: Response, next: NextFunction) {
         if (req.serviceUser) {
-            let note = req.query.note ? req.query.note as string : undefined;
+            const note = req.query.note ? req.query.note as string : undefined;
             KeyPairMapper.Instance.KeysForUser(req.serviceUser.id!, note)
                 .then((results) => {
                     results.asResponse(res);
@@ -487,7 +487,7 @@ export default class UserRoutes {
 
     private static listServiceKeysForContainer(req: Request, res: Response, next: NextFunction) {
         if (req.container) {
-            let note = req.query.note ? req.query.note as string : undefined;
+            const note = req.query.note ? req.query.note as string : undefined;
             KeyPairMapper.Instance.ServiceKeysForContainer(req.container.id!, note)
                 .then((results) => {
                     results.asResponse(res);
diff --git a/src/http_server/routes/data_warehouse/data/graph_functions/node_functions.ts b/src/http_server/routes/data_warehouse/data/graph_functions/node_functions.ts
index 0007f4ba2..752f342dd 100644
--- a/src/http_server/routes/data_warehouse/data/graph_functions/node_functions.ts
+++ b/src/http_server/routes/data_warehouse/data/graph_functions/node_functions.ts
@@ -15,9 +15,7 @@ import NodeRepository from '../../../../../data_access_layer/repositories/data_w
 import NodeLeafRepository from '../../../../../data_access_layer/repositories/data_warehouse/data/node_leaf_repository';
 const nodeRepo = new NodeRepository();
 
-
 export default class NodeFunctions {
-
     public static listNodes(req: Request, res: Response, next: NextFunction) {
         // fresh instance of the repo to avoid filter issues
         if (req.container) {
@@ -38,8 +36,8 @@ export default class NodeFunctions {
 
             if (String(req.query.includeRawData).toLowerCase() === 'true') {
                 repo = repo
-                .join('data_staging', {origin_col:'data_staging_id', destination_col:'id'})
-                .addFields({'data': 'raw_data_properties'}, repo._aliasMap.get('data_staging'))
+                    .join('data_staging', {origin_col: 'data_staging_id', destination_col: 'id'})
+                    .addFields({data: 'raw_data_properties'}, repo._aliasMap.get('data_staging'));
             }
 
             if (req.query.count !== undefined && String(req.query.count).toLowerCase() === 'true') {
@@ -58,7 +56,7 @@ export default class NodeFunctions {
                 repo.list(String(req.query.loadMetatypes).toLowerCase() === 'true', {
                     limit: req.query.limit ? +req.query.limit : undefined,
                     offset: req.query.offset ? +req.query.offset : undefined,
-                    includeHistory: String(req.query.history).toLowerCase() === 'true'
+                    includeHistory: String(req.query.history).toLowerCase() === 'true',
                 })
                     .then((result) => {
                         if (result.isError && result.error) {
@@ -79,8 +77,9 @@ export default class NodeFunctions {
     public static retrieveNode(req: Request, res: Response, next: NextFunction) {
         // first check if the node history is desired, otherwise load the single current node
         if (String(req.query.history).toLowerCase() === 'true' && req.container) {
-            const includeRawData = (String(req.query.includeRawData).toLowerCase() === 'true') ? true : false
-            nodeRepo.findNodeHistoryByID(req.params.nodeID, includeRawData)
+            const includeRawData = String(req.query.includeRawData).toLowerCase() === 'true';
+            nodeRepo
+                .findNodeHistoryByID(req.params.nodeID, includeRawData)
                 .then((result) => {
                     if (result.isError && result.error) {
                         result.asResponse(res);
@@ -127,28 +126,25 @@ export default class NodeFunctions {
         // fresh instance of the repo to avoid filter issues
         if (req.container && req.metatype) {
             let repo = new NodeRepository();
-            repo = repo.where()
-                .containerID('eq', req.container.id!)
-                .and()
-                .metatypeID('eq', req.metatype.id);
+            repo = repo.where().containerID('eq', req.container.id!).and().metatypeID('eq', req.metatype.id);
             if (String(req.query.includeRawData).toLowerCase() === 'true') {
                 repo = repo
-                .join('data_staging', {origin_col:'data_staging_id', destination_col:'id'})
-                .addFields({'data': 'raw_data_properties'}, repo._aliasMap.get('data_staging'))
+                    .join('data_staging', {origin_col: 'data_staging_id', destination_col: 'id'})
+                    .addFields({data: 'raw_data_properties'}, repo._aliasMap.get('data_staging'));
             }
             repo.list(String(req.query.loadMetatypes).toLowerCase() === 'true', {
                 limit: req.query.limit ? +req.query.limit : undefined,
                 offset: req.query.offset ? +req.query.offset : undefined,
             })
-            .then((result) => {
-                if (result.isError && result.error) {
-                    result.asResponse(res);
-                    return;
-                }
-                res.status(200).json(result);
-            })
-            .catch((err) => Result.Failure(err, 404).asResponse(res))
-            .finally(() => next());
+                .then((result) => {
+                    if (result.isError && result.error) {
+                        result.asResponse(res);
+                        return;
+                    }
+                    res.status(200).json(result);
+                })
+                .catch((err) => Result.Failure(err, 404).asResponse(res))
+                .finally(() => next());
         } else {
             Result.Failure(`container or metatype not found`, 404).asResponse(res);
             next();
@@ -171,8 +167,10 @@ export default class NodeFunctions {
             });
         }
 
+        const merge = String(req.query.merge).toLowerCase() === 'true';
+
         nodeRepo
-            .bulkSave(req.currentUser!, toSave)
+            .bulkSave(req.currentUser!, toSave, undefined, merge)
             .then((result) => {
                 if (result.isError) {
                     Result.Error(result.error?.error).asResponse(res);
@@ -203,5 +201,4 @@ export default class NodeFunctions {
             next();
         }
     }
-    
-}
\ No newline at end of file
+}
diff --git a/src/http_server/routes/data_warehouse/data/graph_routes.ts b/src/http_server/routes/data_warehouse/data/graph_routes.ts
index 1ba42bce8..a8fb50b3b 100644
--- a/src/http_server/routes/data_warehouse/data/graph_routes.ts
+++ b/src/http_server/routes/data_warehouse/data/graph_routes.ts
@@ -17,6 +17,8 @@ import WebGLFunctions from './graph_functions/webgl_functions';
 import Config from '../../../../services/config';
 import Result from '../../../../common_classes/result';
 import ContainerRepository from '../../../../data_access_layer/repositories/data_warehouse/ontology/container_respository';
+import RedisGraphService from '../../../../services/cache/redis_graph_loader';
+import {parseISO} from 'date-fns';
 
 export default class GraphRoutes {
     public static mount(app: Application, middleware: any[]) {
@@ -166,6 +168,7 @@ export default class GraphRoutes {
         );
         app.get('/containers/:containerID/graphs/webgl', ...middleware, authInContainer('read', 'data'), WebGLFunctions.listWebglFilesAndTags);
         app.post('/containers/:containerID/graphs/load', ...middleware, authInContainer('read', 'data'), loadRedisGraph);
+        app.post('/containers/:containerID/graphs/query', ...middleware, authInContainer('read', 'data'), queryRedisGraph);
         app.put('/containers/:containerID/graphs/webgl/files/:fileID', ...middleware, authInContainer('write', 'data'), WebGLFunctions.updateWebglFiles);
         app.delete('/containers/:containerID/graphs/webgl/files/:fileID', ...middleware, authInContainer('write', 'data'), FileFunctions.deleteFile);
     }
@@ -186,3 +189,42 @@ function loadRedisGraph(req: Request, res: Response, next: NextFunction) {
         next();
     }
 }
+
+function queryRedisGraph(req: Request, res: Response, next: NextFunction) {
+    if (req.container) {
+        let timestamp;
+        if (typeof req.query.timestamp !== 'undefined' && (req.query.timestamp as string) !== '') {
+            const date_conversion_format = 'yyyy-MM-ddTHH:mm:ss.SSSZ';
+            const convertedDate = parseISO(req.query.timestamp.toString());
+
+            // if conversion is unsuccessful, return from the call with an explanation
+            if (isNaN(convertedDate.getTime())) {
+                return res
+                    .status(400)
+                    .json(
+                        'The timestamp query parameter was not provided a valid date input. ' +
+                            'Please provide an input in the format ' +
+                            date_conversion_format,
+                    );
+            }
+
+            timestamp = req.query.timestamp.toString();
+
+            // dates are rounded to the minute to avoid proliferation of graphs
+            const coef = 1000 * 60;
+            timestamp = new Date(Math.floor(new Date(timestamp).getTime() / coef) * coef).toISOString();
+        }
+
+        const redisGraph = new RedisGraphService();
+        redisGraph
+            .queryGraph(req.container?.id!, {query: req.body.query, variables: req.body.variables}, timestamp)
+            .then((result) => {
+                result.asResponse(res);
+            })
+            .catch((e) => Result.Error(e).asResponse(res))
+            .finally(() => next());
+    } else {
+        Result.Failure('container not found', 404).asResponse(res);
+        next();
+    }
+}
diff --git a/src/http_server/routes/data_warehouse/ontology/container_routes.ts b/src/http_server/routes/data_warehouse/ontology/container_routes.ts
index 83c4b351a..b9a6e0019 100644
--- a/src/http_server/routes/data_warehouse/ontology/container_routes.ts
+++ b/src/http_server/routes/data_warehouse/ontology/container_routes.ts
@@ -2,14 +2,17 @@ import {Application, NextFunction, Request, Response} from 'express';
 import {authInContainer, authRequest} from '../../../middleware';
 import ContainerImport, {ContainerImportT} from '../../../../data_access_layer/mappers/data_warehouse/ontology/container_import';
 import ContainerRepository from '../../../../data_access_layer/repositories/data_warehouse/ontology/container_respository';
-import {plainToClass} from 'class-transformer';
-import Container, {ContainerExport, ContainerConfig} from '../../../../domain_objects/data_warehouse/ontology/container';
+import {plainToClass, plainToInstance} from 'class-transformer';
+import Container, {
+    ContainerExport,
+    ContainerConfig,
+    DataSourceTemplate
+} from '../../../../domain_objects/data_warehouse/ontology/container';
 import Result from '../../../../common_classes/result';
 import {FileInfo} from 'busboy';
 import FileRepository from '../../../../data_access_layer/repositories/data_warehouse/data/file_repository';
 import DataSourceRepository from '../../../../data_access_layer/repositories/data_warehouse/import/data_source_repository';
 import {DataSource} from '../../../../interfaces_and_impl/data_warehouse/import/data_source';
-import pAll from 'p-all';
 import TypeMappingRepository from '../../../../data_access_layer/repositories/data_warehouse/etl/type_mapping_repository';
 import TypeMapping from '../../../../domain_objects/data_warehouse/etl/type_mapping';
 
@@ -45,6 +48,15 @@ export default class ContainerRoutes {
 
         app.get('/containers/:containerID/alerts', ...middleware, authInContainer('read', 'ontology'), this.listAlerts);
         app.post('/containers/:containerID/alerts/:alertID', ...middleware, authInContainer('write', 'containers'), this.acknowledgeAlert);
+
+        app.get('/containers/:containerID/data_source_templates', ...middleware, authInContainer('write', 'containers'), this.listDataSourceTemplates);
+        app.post('/containers/:containerID/data_source_templates', ...middleware, authInContainer('write', 'containers'), this.saveDataSourceTemplates);
+        app.delete(
+            '/containers/:containerID/data_source_templates/:templateID', 
+            ...middleware, 
+            authInContainer('write', 'containers'), 
+            this.deleteDataSourceTemplate
+        );
     }
 
     private static createContainer(req: Request, res: Response, next: NextFunction) {
@@ -322,10 +334,22 @@ export default class ContainerRoutes {
             containerExport.data_sources = dataSourceExport.value as DataSource[];
         }
         if (String(req.query.exportTypeMappings).toLowerCase() === 'true') {
-            // Implement in future update
             const typeRepo = new TypeMappingRepository().where().containerID('eq', req.container?.id);
             const mappings = await typeRepo.list(true);
-            containerExport.type_mappings = mappings.value;
+
+            // we need to prepare the mappings with metatype/key names 
+            // for id lookup to work in the destination container
+            const preparedMappingsPromises = mappings.value.map(async mapping => {
+                // data source id is removed by this function but is needed prior to export
+                const dataSourceId = mapping.data_source_id;
+                const preparedMapping = await typeRepo.prepareForImport(mapping, undefined, true);
+                preparedMapping.data_source_id = dataSourceId;
+                return preparedMapping;
+            });
+
+            const preparedMappings = await Promise.all(preparedMappingsPromises);
+
+            containerExport.type_mappings = preparedMappings;
         }
 
         repository
@@ -465,4 +489,63 @@ export default class ContainerRoutes {
 
         return req.pipe(busboy);
     }
+
+    private static listDataSourceTemplates(req: Request, res: Response, next: NextFunction) {
+        if (req.container && req.container.id) {
+            repository
+                .listDataSourceTemplates(req.container.id)
+                .then((result) => {
+                    result.asResponse(res);
+                })
+                .catch((err) => {
+                    Result.Error(err).asResponse(res);
+                })
+                .finally(() => next());
+        } else {
+            Result.Failure(`unable to find container`, 404).asResponse(res);
+            next();
+        }
+    }
+
+    private static saveDataSourceTemplates(req: Request, res: Response, next: NextFunction) {
+        if (req.container && req.container.id) {
+            let toSave: DataSourceTemplate[];
+
+            if (Array.isArray(req.body)) {
+                toSave = plainToInstance(DataSourceTemplate, req.body);
+            } else {
+                toSave = [plainToInstance(DataSourceTemplate, req.body as object)];
+            }
+
+            repository
+                .bulkSaveDataSourceTemplates(toSave, req.container.id,)
+                .then((result) => {
+                    result.asResponse(res);
+                })
+                .catch((err) => {
+                    Result.Error(err).asResponse(res);
+                })
+                .finally(() => next());
+        } else {
+            Result.Failure(`unable to find container`, 404).asResponse(res);
+            next();
+        }
+    }
+
+    private static deleteDataSourceTemplate(req: Request, res: Response, next: NextFunction) {
+        if (req.container && req.container.id && req.params.templateID) {
+            repository
+                .bulkDeleteDataSourceTemplates([req.params.templateID], req.container.id,)
+                .then((result) => {
+                    result.asResponse(res);
+                })
+                .catch((err) => {
+                    Result.Error(err).asResponse(res);
+                })
+                .finally(() => next());
+        } else {
+            Result.Failure(`unable to find container`, 404).asResponse(res);
+            next();
+        }
+    }
 }
diff --git a/src/interfaces_and_impl/data_warehouse/import/custom_data_source.ts b/src/interfaces_and_impl/data_warehouse/import/custom_data_source.ts
new file mode 100644
index 000000000..b704e040a
--- /dev/null
+++ b/src/interfaces_and_impl/data_warehouse/import/custom_data_source.ts
@@ -0,0 +1,80 @@
+import NodeRSA from "node-rsa";
+import DataSourceRecord, { CustomDataSourceConfig } from "../../../domain_objects/data_warehouse/import/data_source";
+import { DataSource } from "./data_source";
+import StandardDataSourceImpl from "./standard_data_source_impl";
+import Config from "../../../services/config";
+import Logger from "../../../services/logger";
+import { plainToClass } from "class-transformer";
+
+const buildUrl = require('build-url');
+
+export default class CustomDataSourceImpl extends StandardDataSourceImpl implements DataSource {
+    decrypted = false;
+
+    constructor(record: DataSourceRecord) {
+        super(record);
+        this.decryptDataSourceRecord();
+    }
+
+    private decryptDataSourceRecord() {
+        // if this is coming from the database it will have an id, this indicates
+        // we need to decrypt certain parts of the config before working
+        if (this.DataSourceRecord && this.DataSourceRecord.id && !this.decrypted) {
+            const key = new NodeRSA(Config.encryption_key_secret);
+
+            const template = (this.DataSourceRecord.config as CustomDataSourceConfig).template!;
+
+            try {
+                if (template?.custom_fields) {
+                    for (const field of template.custom_fields!) {
+                        if (field.encrypt === true && field.value !== undefined) {
+                            field.value = key.decryptPublic(field.value!, 'utf8');
+                        }
+                    }
+                }
+            } catch (err) {
+                Logger.error(`error while attempting to decrypt custom ${template.name} data source config ${err}`);
+                return;
+            }
+        }
+    };
+
+    async ToSave(): Promise<DataSourceRecord> {
+        const key = new NodeRSA(Config.encryption_key_secret);
+
+        // we do this to avoid having to use the constructor or pollute the current record
+        const output = plainToClass(DataSourceRecord, {...this.DataSourceRecord});
+
+        if ((output.config as CustomDataSourceConfig)?.template) {
+            const template = (output.config as CustomDataSourceConfig).template;
+
+            if (template?.custom_fields) {
+                for (const field of template.custom_fields!) {
+                    if (field.encrypt === true && field.value !== undefined) {
+                        field.value = key.encryptPrivate(field.value, 'base64');
+                    }
+                }
+            }
+        }
+
+        return Promise.resolve(output);
+    }
+
+    ToExport(): Promise<DataSourceRecord> {
+        const output = plainToClass(DataSourceRecord, {...this.DataSourceRecord});
+
+        if ((output.config as CustomDataSourceConfig)?.template) {
+            const template = (output.config as CustomDataSourceConfig).template;
+            
+            if (template?.custom_fields) {
+                for (const field of template.custom_fields!) {
+                    if (field.encrypt === true && field.value !== undefined) {
+                        field.value = undefined;
+                    }
+                }
+            }
+        }
+
+        return Promise.resolve(output);
+    }
+}
\ No newline at end of file
diff --git a/src/interfaces_and_impl/data_warehouse/import/p6_data_source.ts b/src/interfaces_and_impl/data_warehouse/import/p6_data_source.ts
index 61e7bbf9a..5beaacc51 100644
--- a/src/interfaces_and_impl/data_warehouse/import/p6_data_source.ts
+++ b/src/interfaces_and_impl/data_warehouse/import/p6_data_source.ts
@@ -5,11 +5,6 @@ import NodeRSA from "node-rsa";
 import Logger from '../../../services/logger';
 import Config from '../../../services/config';
 import { plainToClass } from "class-transformer";
-import { KeyPair, User } from "../../../domain_objects/access_management/user";
-import Result from '../../../common_classes/result';
-import KeyPairMapper from "../../../data_access_layer/mappers/access_management/keypair_mapper";
-import KeyPairRepository from "../../../data_access_layer/repositories/access_management/keypair_repository";
-import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
 
 const buildUrl = require('build-url');
 
diff --git a/src/services/cache/redis_graph_loader.ts b/src/services/cache/redis_graph_loader.ts
index 2063bc4cc..7a827be55 100644
--- a/src/services/cache/redis_graph_loader.ts
+++ b/src/services/cache/redis_graph_loader.ts
@@ -1,11 +1,19 @@
 import Config from '../config';
 import {RedisGraphLoader} from 'deeplynx';
+import Result from '../../common_classes/result';
+import {Redis} from 'ioredis';
+import {Query} from '../../graphql/schema';
 
-export default class RedisGraphLoaderService {
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import {RedisStatic} from 'ioredis';
+
+export default class RedisGraphService {
     private loader: RedisGraphLoader;
+    private _redis: Redis;
 
-    public static GetInstance(): Promise<RedisGraphLoaderService> {
-        const instance = new RedisGraphLoaderService();
+    public static GetInstance(): Promise<RedisGraphService> {
+        const instance = new RedisGraphService();
         return new Promise((resolve, reject) => {
             instance
                 .init(Config.core_db_connection_string, Config.redis_connection_string)
@@ -24,9 +32,94 @@ export default class RedisGraphLoaderService {
 
     constructor() {
         this.loader = new RedisGraphLoader();
+        this._redis = new Redis(Config.redis_connection_string);
+        this.setQueryTransformer();
+    }
+
+    setQueryTransformer() {
+        Redis.Command.setReplyTransformer('GRAPH.RO_QUERY', (result) => {
+            const metaInformation = this.parseMetaInformation(result.pop());
+
+            let parsedResults: any[] = [];
+
+            if (result.length > 1) {
+                // if there are results to parse
+                const columnHeaders = result[0];
+                const resultSet = result[1];
+
+                parsedResults = resultSet.map((result: any) => {
+                    return this.parseResult(columnHeaders, result);
+                });
+            }
+
+            return parsedResults;
+        });
     }
 
-    loadGraph(containerID: string, timestamp?: string): Promise<void> {
-        return this.loader.generateRedisGraph(containerID, timestamp);
+    parseMetaInformation(array: any[]): any {
+        const meta: any = {};
+        for (const prop of array) {
+            let [name, value] = prop.split(': ');
+            if (value) {
+                value = value.trim();
+                name = name;
+                meta[name] = value;
+            }
+        }
+        return meta;
+    }
+
+    parseResult(columnHeaders: string[], singleResult: any): any {
+        const columns = columnHeaders.map((columnHeader: string, index: number) => {
+            const name = columnHeader;
+            let value = singleResult[index];
+
+            if (Array.isArray(value)) {
+                value = Object.fromEntries(value);
+            }
+
+            if (value.labels && value.labels.length === 1) {
+                value.labels = value.labels[0];
+            }
+
+            if (value.properties && Array.isArray(value.properties)) {
+                value.properties = Object.fromEntries(value.properties);
+            }
+
+            try {
+                return [name, JSON.parse(value)];
+            } catch (error) {
+                return [name, value];
+            }
+        });
+
+        return Object.fromEntries(columns);
+    }
+
+    loadGraph(containerID: string, timestamp?: string, ttl?: number): Promise<string> {
+        return this.loader.generateRedisGraph(containerID, timestamp, ttl);
+    }
+
+    async queryGraph(containerID: string, query: Query, timestamp?: string): Promise<Result<any>> {
+        const keyTimestamp = timestamp || 'default';
+        let key = `${containerID}-${keyTimestamp}`;
+
+        await this._redis
+            .exists(key)
+            .then(async (result) => {
+                if (result === 0) {
+                    // graph for this container and timestamp combination has not been created, create it
+                    const loader = await RedisGraphService.GetInstance();
+                    key = await loader.loadGraph(containerID, timestamp);
+                }
+            })
+            .catch((e) => console.log(e));
+
+        try {
+            const result = await this._redis.call('GRAPH.RO_QUERY', key, query.query);
+            return Promise.resolve(Result.Success(result));
+        } catch (e: any) {
+            return Promise.resolve(Result.Failure(e.toString()));
+        }
     }
 }
diff --git a/src/services/config.ts b/src/services/config.ts
index bba902b5d..611d7fd4e 100644
--- a/src/services/config.ts
+++ b/src/services/config.ts
@@ -32,6 +32,7 @@ export class Config {
     private readonly _cache_provider: string;
     private readonly _cache_default_ttl: number;
     private readonly _cache_redis_connection_string: string;
+    private readonly _redis_graph_ttl: number;
     private readonly _initial_import_cache_ttl: number;
     private readonly _import_cache_ttl: number;
     private readonly _log_db: boolean;
@@ -160,6 +161,7 @@ export class Config {
         // default to 6 hours for the initial import cache, subsequent should be 30 seconds
         this._initial_import_cache_ttl = process.env.INITIAL_IMPORT_CACHE_TTL ? parseInt(process.env.INITIAL_IMPORT_CACHE_TTL!, 10) : 21600;
         this._import_cache_ttl = process.env.IMPORT_CACHE_TTL ? parseInt(process.env.IMPORT_CACHE_TTL!, 10) : 300;
+        this._redis_graph_ttl = process.env.REDIS_GRAPH_TTL ? parseInt(process.env.REDIS_GRAPH_TTL!, 10) : 3600;
 
         this._core_db_connection_string = process.env.CORE_DB_CONNECTION_STRING || '';
         this._timescaledb_enabled = process.env.TIMESCALEDB_ENABLED === 'true';
@@ -359,6 +361,10 @@ export class Config {
         return this._cache_redis_connection_string;
     }
 
+    get redis_graph_ttl(): number {
+        return this._redis_graph_ttl;
+    }
+
     get server_port(): string {
         return this._server_port;
     }
diff --git a/src/tests/.env-sample b/src/tests/.env-sample
index 2189c1ab2..00983b419 100644
--- a/src/tests/.env-sample
+++ b/src/tests/.env-sample
@@ -35,6 +35,8 @@ CACHE_PROVIDER=memory
 CACHE_DEFAULT_TTL=21600
 # redis connection string - e.g redis://user:password@redis-service.com:6379/
 CACHE_REDIS_CONNECTION_STRING=
+# redis graph expiry timer in seconds
+REDIS_GRAPH_TTL=3600
 
 # debug,info,warn,error,silent
 LOG_LEVEL=debug
diff --git a/src/tests/data_warehouse/import/custom_data_source_impl.spec.ts b/src/tests/data_warehouse/import/custom_data_source_impl.spec.ts
new file mode 100644
index 000000000..6c613d249
--- /dev/null
+++ b/src/tests/data_warehouse/import/custom_data_source_impl.spec.ts
@@ -0,0 +1,186 @@
+import PostgresAdapter from '../../../data_access_layer/mappers/db_adapters/postgres/postgres';
+import ContainerMapper from '../../../data_access_layer/mappers/data_warehouse/ontology/container_mapper';
+import Logger from '../../../services/logger';
+import { User } from '../../../domain_objects/access_management/user';
+import Container, {CustomTemplateField, DataSourceTemplate} from '../../../domain_objects/data_warehouse/ontology/container';
+import faker from 'faker';
+import { expect } from 'chai';
+import UserMapper from '../../../data_access_layer/mappers/access_management/user_mapper';
+import DataSourceRepository, { DataSourceFactory } from '../../../data_access_layer/repositories/data_warehouse/import/data_source_repository';
+import DataSourceRecord, { CustomDataSourceConfig } from '../../../domain_objects/data_warehouse/import/data_source';
+import {instanceToPlain} from "class-transformer";
+
+describe('A Custom Data Source implementation', async () => {
+    let containerID: string = process.env.TEST_CONTAINER_ID || '';
+    let user: User;
+    const sourceRepo: DataSourceRepository = new DataSourceRepository();
+
+    before(async function () {
+        if (process.env.CORE_DB_CONNECTION_STRING === '') {
+            Logger.debug('skipping custom adapter tests, no storage layer');
+            this.skip();
+        }
+
+        await PostgresAdapter.Instance.init();
+        const mapper = ContainerMapper.Instance;
+
+        const container = await mapper.Create(
+            'test suite',
+            new Container({
+                name: faker.name.findName(),
+                description: faker.random.alphaNumeric(),
+            }),
+        );
+
+        expect(container.isError).false;
+        expect(container.value.id).not.null;
+        containerID = container.value.id!;
+
+        const userResult = await UserMapper.Instance.Create(
+            'test suite',
+            new User({
+                identity_provider_id: faker.random.uuid(),
+                identity_provider: 'username_password',
+                admin: false,
+                display_name: faker.name.findName(),
+                email: faker.internet.email(),
+                roles: ['superuser'],
+            }),
+        );
+
+        expect(userResult.isError).false;
+        expect(userResult.value).not.empty;
+        user = userResult.value;
+        return Promise.resolve();
+    });
+
+    after(async () => {
+        await UserMapper.Instance.Delete(user.id!);
+        await ContainerMapper.Instance.Delete(containerID);
+        return PostgresAdapter.Instance.close();
+    });
+
+    it('can save a template in a custom source', async () => {
+        const template = new DataSourceTemplate({
+            name: 'test123',
+        });
+
+        const config = new CustomDataSourceConfig({template});
+
+        const source = await createSource(containerID, config);
+
+        const results = await sourceRepo.save(source!, user);
+        expect(results.isError, results.error?.error).false;
+        expect(results.value).true;
+
+        return sourceRepo.delete(source!, {force: true, removeData: true});
+    });
+
+    it('fails validation if a required or encrypted field is undefined', async () => {
+        // attempt to save an encrypted custom field with no value
+        let template = new DataSourceTemplate({
+            name: 'encrypted- no value',
+            custom_fields: [{
+                name: 'test',
+                encrypt: true
+            }]
+        });
+
+        let config = new CustomDataSourceConfig({template});
+        let source = await createSource(containerID, config);
+        let results = await sourceRepo.save(source!, user);
+        expect(results.isError).true;
+        expect(results.error).to.have.property('error');
+        expect(results.error?.error).to.include('All encrypted fields must be required and have a value present');
+
+        // attempt to save a required custom field with no value
+        template = new DataSourceTemplate({
+            name: 'required- no value',
+            custom_fields: [{
+                name: 'test',
+                required: true
+            }]
+        });
+
+        config = new CustomDataSourceConfig({template});
+        source = await createSource(containerID, config);
+        results = await sourceRepo.save(source!, user);
+        expect(results.isError).true;
+        expect(results.error).to.have.property('error');
+        expect(results.error?.error).to.include('All required fields must have a value present');
+
+        // attempt to save an encrypted custom field that is not required
+        template = new DataSourceTemplate({
+            name: 'encrypted- not required',
+            custom_fields: [{
+                name: 'test',
+                value: 'value to encrypt',
+                encrypt: true,
+                required: false
+            }]
+        });
+
+        config = new CustomDataSourceConfig({template});
+        source = await createSource(containerID, config);
+        results = await sourceRepo.save(source!, user);
+        expect(results.isError).true;
+        expect(results.error).to.have.property('error');
+        expect(results.error?.error).to.include('All encrypted fields must be required and have a value present');
+
+        return sourceRepo.delete(source!, {force: true, removeData: true});
+    });
+
+    it('hides values when class is converted to plain', async () => {
+        let template = new DataSourceTemplate({
+            name: 'encryption test',
+            custom_fields: [{
+                name: 'encrypt this',
+                required: true,
+                encrypt: true,
+                value: 'hidden value'
+            },{
+                name: 'another thing',
+                value: 'also hidden'
+            },{
+                name: 'thing three',
+                encrypt: false,
+                value: 'believe it or not, hidden'
+            }]
+        });
+
+        const config = new CustomDataSourceConfig({template});
+        const source = await createSource(containerID, config);
+        const results = await sourceRepo.save(source!, user);
+        expect(results.isError, results.error?.error).false;
+        expect(results.value).true;
+
+        const list = await sourceRepo.where().containerID('eq', containerID).list();
+        expect(list.isError).false;
+        expect(list.value).not.undefined;
+        // convert to plain and check out the config to ensure no values are present
+        let toPlainFields = instanceToPlain(list.value)[0].DataSourceRecord.config.template.custom_fields;
+        toPlainFields.forEach((field: CustomTemplateField) => {
+            expect(field.value).undefined;
+        });
+        // now ignore decorators to simulate an API request for the decrypted record
+        toPlainFields = instanceToPlain(list.value, {ignoreDecorators: true})[0].DataSourceRecord.config.template.custom_fields;
+        expect(toPlainFields[0].value).eq(template.custom_fields![0].value);
+        expect(toPlainFields[1].value).eq(template.custom_fields![1].value);
+        expect(toPlainFields[2].value).eq(template.custom_fields![2].value);
+
+        return sourceRepo.delete(source!, {force: true, removeData: true});
+    });
+});
+
+async function createSource(containerID: string, config: CustomDataSourceConfig) {
+    return new DataSourceFactory().fromDataSourceRecord(
+        new DataSourceRecord({
+            container_id: containerID,
+            name: 'Test Custom Source',
+            active: false,
+            adapter_type: 'custom',
+            data_format: 'json',
+            config
+        })
+    );
+}
\ No newline at end of file
diff --git a/src/tests/data_warehouse/ontology/containers/template_mapper.spec.ts b/src/tests/data_warehouse/ontology/containers/template_mapper.spec.ts
new file mode 100644
index 000000000..813feb669
--- /dev/null
+++ b/src/tests/data_warehouse/ontology/containers/template_mapper.spec.ts
@@ -0,0 +1,353 @@
+import faker from 'faker';
+import {expect} from 'chai';
+import 'reflect-metadata';
+import PostgresAdapter from '../../../../data_access_layer/mappers/db_adapters/postgres/postgres';
+import ContainerStorage from '../../../../data_access_layer/mappers/data_warehouse/ontology/container_mapper';
+import Logger from '../../../../services/logger';
+import Container, { DataSourceTemplate } from '../../../../domain_objects/data_warehouse/ontology/container';
+
+describe('When managing Data Source Templates, A Container Mapper', async () => {
+    before(async function () {
+        if (process.env.CORE_DB_CONNECTION_STRING === '') {
+            Logger.debug('skipping container tests, no storage layer');
+            this.skip();
+        }
+
+        await PostgresAdapter.Instance.init();
+
+        return Promise.resolve();
+    });
+
+    after(async () => {
+        return PostgresAdapter.Instance.close();
+    });
+
+    it('can add a data source template to the container config', async () => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+
+        const template = templates[0];
+
+        const created = await mapper.CreateDataSourceTemplate(template, container.value.id!);
+        expect(created.isError, created.error?.error).false;
+        expect(created.value).not.undefined;
+        // fetch the updated container from DB and ensure the config is updated
+        // and that no data from the original has been corrupted/removed
+        const fetchedContainer = await mapper.Retrieve(container.value.id!);
+        expect(fetchedContainer.isError).false;
+        expect(fetchedContainer.value).not.empty;
+
+        expect(fetchedContainer.value.name).eq(container.value.name);
+        expect(fetchedContainer.value.description).eq(container.value.description);
+        expect(fetchedContainer.value.config?.data_source_templates).not.undefined;
+        expect(fetchedContainer.value.config?.data_source_templates![0].name).eq('P6');
+        expect(fetchedContainer.value.config?.data_source_templates![0].redirect_address).eq('localhost:8181');
+        expect(fetchedContainer.value.config?.data_source_templates![0].custom_fields?.length).eq(2);
+
+        return mapper.Delete(container.value.id!);
+    })
+
+    it('can bulk add data source templates to the container config', async () => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+        expect(container.value).not.empty;
+        const containerID = container.value.id!
+
+        const toCreate = templates.slice(0, 2);
+
+        const created = await mapper.BulkCreateDataSourceTemplates(toCreate, containerID);
+        expect(created.isError, created.error?.error).false;
+        expect(created.value.length).eq(2);
+
+        // fetch the updated container and ensure config is updated
+        const fetchedContainer = await mapper.Retrieve(container.value.id!);
+        expect(fetchedContainer.isError).false;
+        expect(fetchedContainer.value).not.empty;
+
+        expect(fetchedContainer.value.name).eq(container.value.name);
+        expect(fetchedContainer.value.description).eq(container.value.description);
+        expect(fetchedContainer.value.config?.data_source_templates).not.undefined;
+        const fetchedTemplates = fetchedContainer.value.config?.data_source_templates!;
+        expect(fetchedTemplates.length).eq(2);
+        expect(fetchedTemplates[0].name).eq('P6');
+        expect(fetchedTemplates[1].name).eq('Jazz');
+
+        return mapper.Delete(containerID);
+    });
+
+    it('can retrieve data source template via ID if it exists', async () => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+        expect(container.value).not.empty;
+        const containerID = container.value.id!
+
+        const toCreate = templates.slice(0, 2);
+
+        const created = await mapper.BulkCreateDataSourceTemplates(toCreate, containerID);
+        expect(created.isError, created.error?.error).false;
+        expect(created.value).not.undefined;
+        expect(created.value.length).eq(2);
+
+        // retrieve one of the existing templates
+        let retrieved = await mapper.RetrieveDataSourceTemplateByID(toCreate[0].id!, containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.id).eq(toCreate[0].id);
+        expect(retrieved.value.name).eq(toCreate[0].name);
+
+        // now attempt to retrieve a nonexistent template- should return a 404
+        retrieved = await mapper.RetrieveDataSourceTemplateByID('123', containerID);
+        expect(retrieved.isError).true;
+        expect(retrieved.error?.errorCode).eq(404);
+
+        return mapper.Delete(containerID);
+    });
+
+    it('can retrieve data source template via name if it exists', async () => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+        expect(container.value).not.empty;
+        const containerID = container.value.id!
+
+        const toCreate = templates.slice(0, 2);
+
+        const created = await mapper.BulkCreateDataSourceTemplates(toCreate, containerID);
+        expect(created.isError, created.error?.error).false;
+        expect(created.value).not.undefined;
+        expect(created.value.length).eq(2);
+
+        // retrieve one of the existing templates
+        let retrieved = await mapper.RetrieveDataSourceTemplateByName(toCreate[1].name!, containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.id).eq(toCreate[1].id);
+        expect(retrieved.value.name).eq(toCreate[1].name);
+
+        // now attempt to retrieve a nonexistent template- should return a 404
+        retrieved = await mapper.RetrieveDataSourceTemplateByName('bob', containerID);
+        expect(retrieved.isError).true;
+        expect(retrieved.error?.errorCode).eq(404);
+
+        return mapper.Delete(containerID);
+    });
+
+    it('can list an array of data source templates from the container config', async() => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+        expect(container.value).not.empty;
+        const containerID = container.value.id!
+
+        const toCreate = templates.slice(0, 2);
+
+        const created = await mapper.BulkCreateDataSourceTemplates(toCreate, containerID);
+        expect(created.isError, created.error?.error).false;
+        expect(created.value).not.undefined;
+        expect(created.value.length).eq(2);
+
+        const retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(2);
+        expect(retrieved.value[1].name).eq('Jazz');
+
+        return mapper.Delete(containerID);
+    });
+
+    it('can update a data source template within the container config', async () => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+        expect(container.value).not.empty;
+        const containerID = container.value.id!
+
+        const toCreate = templates.slice(0, 2);
+
+        const created = await mapper.BulkCreateDataSourceTemplates(toCreate, containerID);
+        expect(created.isError, created.error?.error).false;
+        expect(created.value).not.undefined;
+        expect(created.value.length).eq(2);
+
+        // check the pre-update values
+        let retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(2);
+        expect(retrieved.value[1].name).eq(templates[1].name);
+        expect(retrieved.value[1].custom_fields?.length).eq(1);
+
+        // update the DataSourceTemplate by matching on ID
+        const newTemplate = new DataSourceTemplate({
+            id: retrieved.value[1].id,
+            name: 'Jazz',
+            custom_fields: [
+                {name: 'username', value: 'username value', required: true, encrypt: true},
+                {name: 'password', value: 'password value', required: true, encrypt: true},
+            ],
+        });
+
+        const updated = await mapper.UpdateDataSourceTemplate(newTemplate, containerID);
+        expect(updated.isError, updated.error?.error).false;
+        expect(updated.value).not.undefined;
+
+        // check to see that update was made properly
+        retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(2);
+        expect(retrieved.value[1].name).eq(newTemplate.name);
+        expect(retrieved.value[1].custom_fields?.length).eq(2);
+        expect(retrieved.value[1].custom_fields![0].name).eq('username');
+        expect(retrieved.value[1].custom_fields![0].required).true;
+
+        return mapper.Delete(containerID);
+    });
+
+    it('can remove a data source template from a container', async () => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+        expect(container.value).not.empty;
+        const containerID = container.value.id!
+
+        const toCreate = templates.slice(0, 2);
+
+        const created = await mapper.BulkCreateDataSourceTemplates(toCreate, containerID);
+        expect(created.isError, created.error?.error).false;
+        expect(created.value).not.undefined;
+        expect(created.value.length).eq(2);
+
+        let retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(2);
+
+        const deleted = await mapper.DeleteDataSourceTemplate(templates[0].id!, containerID);
+        expect(deleted.isError, deleted.error?.error).false;
+        expect(deleted.value).not.undefined;
+
+        // ensure the delete went through and that template1 was removed
+        retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(1);
+        expect(retrieved.value[0].name).eq(templates[1].name);
+
+        return mapper.Delete(containerID);
+    });
+
+    it('can bulk remove data source templates from a container', async () => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+        expect(container.value).not.empty;
+        const containerID = container.value.id!
+
+        const toCreate = templates.slice(0, 2);
+
+        const created = await mapper.BulkCreateDataSourceTemplates(toCreate, containerID);
+        expect(created.isError, created.error?.error).false;
+        expect(created.value).not.undefined;
+        expect(created.value.length).eq(2);
+
+        // ensure the data source templates were created before we delete them
+        let retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(2);
+
+        const toDelete = templates.map(t => t.id!);
+        const deleted = await mapper.BulkDeleteDataSourceTemplates(toDelete, containerID);
+        expect(deleted.isError, deleted.error?.error).false;
+        expect(deleted.value).not.undefined;
+        expect(deleted.value.length).eq(0);
+
+        retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(0);
+
+        return mapper.Delete(containerID);
+    });
+
+    it('can authorize a data source template', async () => {
+        const mapper = ContainerStorage.Instance;
+
+        const container = await createContainer();
+        expect(container.isError).false;
+        expect(container.value).not.empty;
+        const containerID = container.value.id!
+
+        const template = templates[0]
+
+        const added = await mapper.CreateDataSourceTemplate(template, container.value.id!);
+        expect(added.isError, added.error?.error).false;
+        expect(added.value).not.undefined;
+        expect(added.value.length).eq(1);
+
+        let retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(1);
+        expect(retrieved.value[0].name).eq('P6');
+        expect(retrieved.value[0].authorized).false;
+        const templateName = retrieved.value[0].name!;
+
+        // authorize the data source template
+        const authorized = await mapper.AuthorizeDataSourceTemplate(templateName, containerID);
+        expect(authorized.isError, authorized.error?.error).false;
+        expect(authorized.value).not.undefined;
+
+        retrieved = await mapper.ListDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value.length).eq(1);
+        expect(retrieved.value[0].authorized).true;
+
+        return mapper.Delete(containerID);
+    });
+});
+
+const templates: DataSourceTemplate[] = [
+    new DataSourceTemplate({
+        name: 'P6',
+        custom_fields: [
+            {name: 'username', value: 'username value', required: true, encrypt: true},
+            {name: 'password', value: 'password value', required: true, encrypt: true},
+        ],
+        redirect_address: 'localhost:8181'
+    }),
+    new DataSourceTemplate({
+        name: 'Jazz',
+        custom_fields: [
+            {name: 'token', value: 'token value', required: true, encrypt: true},
+        ],
+    }),
+    new DataSourceTemplate({
+        name: 'Windchill',
+        custom_fields: [
+            {name: 'token', value: 'token value', required: true, encrypt: true},
+        ],
+    }),
+];
+
+async function createContainer() {
+    return ContainerStorage.Instance.Create(
+        'test suite',
+        new Container({
+            name: faker.name.findName(),
+            description: faker.random.alphaNumeric(),
+        }),
+    );
+}
\ No newline at end of file
diff --git a/src/tests/data_warehouse/ontology/containers/template_repository.spec.ts b/src/tests/data_warehouse/ontology/containers/template_repository.spec.ts
new file mode 100644
index 000000000..33a816f6d
--- /dev/null
+++ b/src/tests/data_warehouse/ontology/containers/template_repository.spec.ts
@@ -0,0 +1,414 @@
+import faker from 'faker';
+import {expect} from 'chai';
+import PostgresAdapter from '../../../../data_access_layer/mappers/db_adapters/postgres/postgres';
+import Logger from '../../../../services/logger';
+import Container, { DataSourceTemplate } from '../../../../domain_objects/data_warehouse/ontology/container';
+import UserMapper from '../../../../data_access_layer/mappers/access_management/user_mapper';
+import ContainerRepository from '../../../../data_access_layer/repositories/data_warehouse/ontology/container_respository';
+import {KeyPair, User} from '../../../../domain_objects/access_management/user';
+import KeyPairRepository from '../../../../data_access_layer/repositories/access_management/keypair_repository';
+import UserRepository from '../../../../data_access_layer/repositories/access_management/user_repository';
+import Config from '../../../../services/config';
+import NodeRSA from 'node-rsa';
+
+describe('When managing Data Source Templates, A Container Repository', async () => {
+    let user: User;
+
+    before(async function () {
+        if (process.env.CORE_DB_CONNECTION_STRING === '') {
+            Logger.debug('skipping container tests, no storage layer');
+            this.skip();
+        }
+
+        await PostgresAdapter.Instance.init();
+
+        const userResult = await UserMapper.Instance.Create(
+            'test suite',
+            new User({
+                identity_provider_id: faker.random.uuid(),
+                identity_provider: 'username_password',
+                admin: false,
+                display_name: faker.name.findName(),
+                email: faker.internet.email(),
+                roles: ['superuser'],
+            }),
+        );
+
+        expect(userResult.isError).false;
+        expect(userResult.value).not.empty;
+        user = userResult.value;
+
+        return Promise.resolve();
+    });
+
+    after(async () => {
+        await UserMapper.Instance.Delete(user.id!);
+        void PostgresAdapter.Instance.close();
+        return Promise.resolve();
+    });
+
+    it('can save a data source template (both create and update)', async () => {
+        const repo = new ContainerRepository();
+        const container = createContainer();
+        const containerSaved = await repo.save(container, user);
+        expect(containerSaved.isError, containerSaved.error?.error).false;
+        expect(container.id).not.undefined;
+        const containerID = container.id!;
+
+        let template = templates[0];
+
+        let saved = await repo.saveDataSourceTemplate(template, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        // fetch the container to see if the template was created
+        let fetchedContainer = await repo.findByID(containerID);
+        expect(fetchedContainer.isError).false;
+        expect(fetchedContainer.value).not.empty;
+        expect(fetchedContainer.value.name).eq(container.name);
+        expect(fetchedContainer.value.config?.data_source_templates).not.undefined;
+        expect(fetchedContainer.value.config?.data_source_templates?.length).eq(1);
+
+        let fetchedTemplate = fetchedContainer.value.config?.data_source_templates![0]!;
+        expect(fetchedTemplate.name).eq('P6');
+        expect(fetchedTemplate.custom_fields?.length).eq(2);
+        expect(fetchedTemplate.id).not.undefined;
+
+        // update by ID
+        template = new DataSourceTemplate({
+            id: fetchedTemplate.id,
+            name: 'P7',
+            custom_fields: [
+                {name: 'username', value: 'new username', required: true, encrypt: true},
+                {name: 'password', value: 'new password', required: true, encrypt: true},
+            ],
+        });
+
+        saved = await repo.saveDataSourceTemplate(template, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        // fetch the container to see if the template was updated
+        fetchedContainer = await repo.findByID(containerID);
+        expect(fetchedContainer.value.config?.data_source_templates).not.undefined;
+        expect(fetchedContainer.value.config?.data_source_templates?.length).eq(1);
+
+        fetchedTemplate = fetchedContainer.value.config?.data_source_templates![0]!;
+        expect(fetchedTemplate.name).eq('P7');
+        expect(fetchedTemplate.custom_fields?.length).eq(2);
+
+        // update by name
+        template = new DataSourceTemplate({
+            name: 'P7',
+            custom_fields: [
+                {name: 'token', value: 'new token', required: true, encrypt: true},
+            ],
+        });
+
+        saved = await repo.saveDataSourceTemplate(template, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        // fetch the container to see if the template was updated
+        fetchedContainer = await repo.findByID(containerID);
+        expect(fetchedContainer.value.config?.data_source_templates).not.undefined;
+        expect(fetchedContainer.value.config?.data_source_templates?.length).eq(1);
+
+        fetchedTemplate = fetchedContainer.value.config?.data_source_templates![0]!;
+        expect(fetchedTemplate.name).eq('P7');
+        expect(fetchedTemplate.custom_fields?.length).eq(1);
+
+        return repo.delete(container);
+    });
+
+    it('will fail validation if the rules are broken', async () => {
+        const repo = new ContainerRepository();
+        const container = createContainer();
+        const containerSaved = await repo.save(container, user);
+        expect(containerSaved.isError, containerSaved.error?.error).false;
+        expect(container.id).not.undefined;
+        const containerID = container.id!;
+
+        // rule 1: all required fields must have value present
+        let toSave = new DataSourceTemplate({
+            name: 'required undefined field',
+            custom_fields: [{
+                name: 'bob',
+                required: true
+            }]
+        });
+
+        let saved = await repo.saveDataSourceTemplate(toSave, containerID);
+        expect(saved.isError).true;
+        expect(saved.error?.error).contains('All required fields must have a value present');
+
+        // rule 2: all encrypted fields must be required (required = false)
+        toSave = new DataSourceTemplate({
+            name: 'required undefined field',
+            custom_fields: [{
+                name: 'bob',
+                required: false,
+                encrypt: true
+            }]
+        });
+
+        saved = await repo.saveDataSourceTemplate(toSave, containerID);
+        expect(saved.isError).true;
+        expect(saved.error?.error).contains('All encrypted fields must be required and have a value present');
+
+        // rule 2: all encrypted fields must be required (required = undefined)
+        toSave = new DataSourceTemplate({
+            name: 'required undefined field',
+            custom_fields: [{
+                name: 'bob',
+                encrypt: true,
+                value: 'greg'
+            }]
+        });
+
+        saved = await repo.saveDataSourceTemplate(toSave, containerID);
+        expect(saved.isError).true;
+        expect(saved.error?.error).contains('All encrypted fields must be required and have a value present');
+
+        return repo.delete(container);
+    });
+
+    it('can bulk save data source templates', async () => {
+        const repo = new ContainerRepository();
+        const container = createContainer();
+        const containerSaved = await repo.save(container, user);
+        expect(containerSaved.isError, containerSaved.error?.error).false;
+        expect(container.id).not.undefined;
+        const containerID = container.id!;
+
+        let toSave = templates.slice(0, 2);
+
+        let saved = await repo.bulkSaveDataSourceTemplates(toSave, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        // fetch the updated container and make sure both templates were added
+        let fetchedContainer = await repo.findByID(containerID);
+        expect(fetchedContainer.isError).false;
+        expect(fetchedContainer.value.config?.data_source_templates).not.undefined;
+        expect(fetchedContainer.value.config?.data_source_templates?.length).eq(2);
+
+        let fetchedTemplates = fetchedContainer.value.config?.data_source_templates!;
+        expect(fetchedTemplates[0].id).not.undefined;
+        expect(fetchedTemplates[0].name).eq('P6');
+        expect(fetchedTemplates[0].custom_fields?.length).eq(2);
+        expect(fetchedTemplates[1].name).eq('Jazz');
+        expect(fetchedTemplates[1].custom_fields?.length).eq(1);
+
+        // update the two existing templates (one by name, one by ID) and add a third
+        toSave = [
+            new DataSourceTemplate({
+                id: fetchedTemplates[0].id, // update by ID
+                name: 'P7',
+                custom_fields: [
+                    {name: 'username', value: 'new username', required: true, encrypt: true},
+                    {name: 'password', value: 'new password', required: true, encrypt: true},
+                    {name: 'extra field'}
+                ],
+            }),
+            new DataSourceTemplate({
+                name: 'Jazz', // update by name
+                custom_fields: [
+                    {name: 'token', value: 'new token', required: true, encrypt: true},
+                    {name: 'extra field'}
+                ],
+            }),
+            templates[2]
+        ];
+
+        saved = await repo.bulkSaveDataSourceTemplates(toSave, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        // fetch the updated container and make sure all templates are appropriate
+        fetchedContainer = await repo.findByID(containerID);
+        expect(fetchedContainer.isError).false;
+        expect(fetchedContainer.value.config?.data_source_templates).not.undefined;
+        expect(fetchedContainer.value.config?.data_source_templates?.length).eq(3);
+
+        fetchedTemplates = fetchedContainer.value.config?.data_source_templates!;
+        expect(fetchedTemplates[0].name).eq('P7');
+        expect(fetchedTemplates[0].custom_fields?.length).eq(3);
+        expect(fetchedTemplates[0].custom_fields![2].name).eq('extra field');
+        expect(fetchedTemplates[1].name).eq('Jazz');
+        expect(fetchedTemplates[1].custom_fields?.length).eq(2);
+        expect(fetchedTemplates[1].custom_fields![1].name).eq('extra field');
+        expect(fetchedTemplates[2].name).eq('Windchill');
+
+        return repo.delete(container);
+    });
+
+    it('can return a list of existing data source templates', async () => {
+        const repo = new ContainerRepository();
+        const container = createContainer();
+        const containerSaved = await repo.save(container, user);
+        expect(containerSaved.isError, containerSaved.error?.error).false;
+        expect(container.id).not.undefined;
+        const containerID = container.id!;
+
+        const saved = await repo.bulkSaveDataSourceTemplates(templates, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        const retrieved = await repo.listDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(3);
+        expect(retrieved.value[0].name).eq('P6');
+        expect(retrieved.value[1].name).eq('Jazz');
+        expect(retrieved.value[2].name).eq('Windchill');
+
+        return repo.delete(container);
+    });
+
+    it('encrypts custom field values if encrypt is specified', async () => {
+        const repo = new ContainerRepository();
+        const container = createContainer();
+        const containerSaved = await repo.save(container, user);
+        expect(containerSaved.isError, containerSaved.error?.error).false;
+        expect(container.id).not.undefined;
+        const containerID = container.id!;
+
+        const saved = await repo.saveDataSourceTemplate(encryptTemplate, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        const retrieved = await repo.listDataSourceTemplates(containerID);
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(1);
+        const fields = retrieved.value[0].custom_fields!;
+        expect(fields).not.undefined;
+        expect(fields.length).eq(4);
+        // value should be encrypted version of the value, not the raw one
+        expect(fields[0].value).not.eq(encryptTemplate.custom_fields![0].value);
+        // decrypt to ensure encryption worked properly
+        expect(decrypt(fields[0].value!)).eq(encryptTemplate.custom_fields![0].value);
+        // this value should be the same, and should not be encrypted
+        expect(fields[1].value).eq(encryptTemplate.custom_fields![1].value);
+        // value should be undefined here
+        expect(fields[2].value).undefined;
+        // value, encrypt, and required should be undefined here
+        expect(fields[3].value).undefined;
+        expect(fields[3].encrypt).undefined;
+        expect(fields[3].required).undefined;
+
+        return repo.delete(container);
+    });
+
+    it('can remove a data source template from a container', async () => {
+        const repo = new ContainerRepository();
+        const container = createContainer();
+        const containerSaved = await repo.save(container, user);
+        expect(containerSaved.isError, containerSaved.error?.error).false;
+        expect(container.id).not.undefined;
+        const containerID = container.id!;
+
+        const saved = await repo.bulkSaveDataSourceTemplates(templates, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        let retrieved = await repo.listDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(3);
+
+        const toDelete = templates.slice(0, 2).map(t => t.id!);
+        const deleted = await repo.bulkDeleteDataSourceTemplates(toDelete, containerID);
+        expect(deleted.isError, saved.error?.error).false;
+
+        retrieved = await repo.listDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(1);
+        expect(retrieved.value[0].name).eq('Windchill');
+
+        return repo.delete(container);
+    });
+
+    it('can authorize a data source template on keypair creation', async () => {
+        const repo = new ContainerRepository();
+        const container = createContainer();
+        const containerSaved = await repo.save(container, user);
+        expect(containerSaved.isError, containerSaved.error?.error).false;
+        expect(container.id).not.undefined;
+        const containerID = container.id!;
+
+        let template = templates[0];
+        let saved = await repo.saveDataSourceTemplate(template, containerID);
+        expect(saved.isError, saved.error?.error).false;
+
+        let retrieved = await repo.listDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value.length).eq(1);
+        expect(retrieved.value[0].authorized).false;
+
+        // create a service user and generate a key pair
+        const userRepo = new UserRepository();
+        const serviceUser = new User({
+            identity_provider: 'service',
+            admin: false,
+            display_name: faker.name.findName(),
+            type: 'service'
+        });
+
+        const serviceUserSaved = await userRepo.save(serviceUser, user);
+        expect(serviceUserSaved.isError, saved.error?.error).false;
+        expect(serviceUser.id).not.undefined;
+
+        const keyRepo = new KeyPairRepository();
+        const keyPair = new KeyPair(serviceUser.id, 'p6_adapter_auth');
+        const keyPairSaved = await keyRepo.save(keyPair, serviceUser, containerID);
+        expect(keyPairSaved.isError, keyPairSaved.error?.error).false;
+        expect(keyPairSaved.value).not.undefined;
+
+        // list the adapter templates again- this time authorized should be true
+        retrieved = await repo.listDataSourceTemplates(containerID);
+        expect(retrieved.isError, retrieved.error?.error).false;
+        expect(retrieved.value).not.undefined;
+        expect(retrieved.value[0].authorized).true;
+
+        return repo.delete(container);
+    });
+});
+
+const templates: DataSourceTemplate[] = [
+    new DataSourceTemplate({
+        name: 'P6',
+        custom_fields: [
+            {name: 'username', value: 'old username', required: true, encrypt: true},
+            {name: 'password', value: 'old password', required: true, encrypt: true},
+        ],
+    }),
+    new DataSourceTemplate({
+        name: 'Jazz',
+        custom_fields: [
+            {name: 'token', value: 'old token', required: true, encrypt: true},
+        ],
+    }),
+    new DataSourceTemplate({
+        name: 'Windchill',
+        custom_fields: [
+            {name: 'token', value: 'old token', required: true, encrypt: true},
+        ],
+    }),
+];
+
+const encryptTemplate: DataSourceTemplate = new DataSourceTemplate({
+    name: 'testing encryption',
+    custom_fields: [
+        {name: 'encrypted', value: 'secret value', required: true, encrypt: true},
+        {name: 'unencrypted', value: 'regular value', required: true},
+        {name: 'not required', required: false},
+        {name: 'just name'}
+    ]
+})
+
+function createContainer() {
+    return new Container({
+        name: faker.name.findName(),
+        description: faker.random.alphaNumeric(),
+    });
+}
+
+function decrypt(toDecrypt: string) {
+    const key = new NodeRSA(Config.encryption_key_secret);
+    return key.decryptPublic(toDecrypt, 'utf8');
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 5e4c6bce4..a92886b0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -123,13 +123,6 @@
     https-proxy-agent "^5.0.0"
     tslib "^2.2.0"
 
-"@azure/core-tracing@^1.0.0", "@azure/core-tracing@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.1.tgz"
-  integrity sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==
-  dependencies:
-    tslib "^2.2.0"
-
 "@azure/core-tracing@1.0.0-preview.13":
   version "1.0.0-preview.13"
   resolved "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz"
@@ -138,6 +131,13 @@
     "@opentelemetry/api" "^1.0.1"
     tslib "^2.2.0"
 
+"@azure/core-tracing@^1.0.0", "@azure/core-tracing@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.1.tgz"
+  integrity sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==
+  dependencies:
+    tslib "^2.2.0"
+
 "@azure/core-util@^1.0.0", "@azure/core-util@^1.1.0", "@azure/core-util@^1.1.1", "@azure/core-util@^1.2.0", "@azure/core-util@^1.3.0":
   version "1.4.0"
   resolved "https://registry.npmjs.org/@azure/core-util/-/core-util-1.4.0.tgz"
@@ -199,6 +199,13 @@
     events "^3.0.0"
     tslib "^2.2.0"
 
+"@babel/code-frame@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5":
   version "7.22.13"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz"
@@ -207,19 +214,12 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/compat-data@^7.22.9":
   version "7.22.9"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz"
   integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
-"@babel/core@^7.0.0", "@babel/core@^7.7.5":
+"@babel/core@^7.7.5":
   version "7.22.11"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz"
   integrity sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==
@@ -347,7 +347,9 @@
     js-tokens "^4.0.0"
 
 "@babel/parser@^7.22.11", "@babel/parser@^7.22.5":
-  version "7.22.14"
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
 "@babel/runtime@^7.10.5", "@babel/runtime@^7.21.0":
   version "7.22.11"
@@ -515,14 +517,6 @@
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.19"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz"
-  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
   resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"
@@ -531,6 +525,14 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.19"
+  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz"
+  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@ladjs/graceful@^1.0.5":
   version "1.1.5"
   resolved "https://registry.npmjs.org/@ladjs/graceful/-/graceful-1.1.5.tgz"
@@ -592,7 +594,7 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -691,7 +693,9 @@
     "@types/node" "*"
 
 "@types/bcryptjs@^2.4.2":
-  version "2.4.3"
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@types/bcryptjs/-/bcryptjs-2.4.4.tgz#cd3c4c007f600f1d21db09c9bd4ced8b49d04670"
+  integrity sha512-9wlJI7k5gRyJEC4yrV7DubzNQFTPiykYxUA6lBtsk5NlOfW9oWLJ1HdIA4YtE+6C3i3mTpDQQEosJ2rVZfBWnw==
 
 "@types/bluebird@*":
   version "3.5.38"
@@ -1027,16 +1031,7 @@
     pg-protocol "^1.2.0"
     pg-types "^2.2.0"
 
-"@types/pg@^8.0.0":
-  version "8.10.2"
-  resolved "https://registry.npmjs.org/@types/pg/-/pg-8.10.2.tgz"
-  integrity sha512-MKFs9P6nJ+LAeHLU3V0cODEOgyThJ3OAnmOlsZsxux6sfQs3HRXR5bBn7xG5DjckEFhTAxsXi7k7cd0pCMxpJw==
-  dependencies:
-    "@types/node" "*"
-    pg-protocol "*"
-    pg-types "^4.0.1"
-
-"@types/pg@^8.6.1":
+"@types/pg@^8.0.0", "@types/pg@^8.6.1":
   version "8.10.2"
   resolved "https://registry.npmjs.org/@types/pg/-/pg-8.10.2.tgz"
   integrity sha512-MKFs9P6nJ+LAeHLU3V0cODEOgyThJ3OAnmOlsZsxux6sfQs3HRXR5bBn7xG5DjckEFhTAxsXi7k7cd0pCMxpJw==
@@ -1047,6 +1042,8 @@
 
 "@types/qs@*":
   version "6.9.8"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.8.tgz#f2a7de3c107b89b441e071d5472e6b726b4adf45"
+  integrity sha512-u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg==
 
 "@types/range-parser@*":
   version "1.2.4"
@@ -1113,6 +1110,8 @@
 
 "@types/uuid@^3.4.9":
   version "3.4.11"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.11.tgz#201bf1ca5756537886931aac6672c21c1a06f98a"
+  integrity sha512-CJNkbEu4IdVuBMRVaNC2GjASgJK7ziqDlVXWuJ1pvhOLADl7nzxhTKjHRdOmo2SuXuygcWBmzgYgn9foTX0UiA==
 
 "@types/validator@^13.7.0", "@types/validator@^13.7.10":
   version "13.11.1"
@@ -1128,17 +1127,23 @@
 
 "@types/xml-crypto@^1.4.2":
   version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@types/xml-crypto/-/xml-crypto-1.4.3.tgz#852db00733c4fb68310bba6088dadb3e49c6238f"
+  integrity sha512-pnvKYb7vUsUIMc+C6JM/j779YWQgOMcwjnqHJ9cdaWXwWEBE1hAqthzeszRx62V5RWMvS+XS9w9tXMOYyUc8zg==
   dependencies:
     "@types/node" "*"
     xpath "0.0.27"
 
 "@types/xml-encryption@^1.2.1":
   version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/xml-encryption/-/xml-encryption-1.2.2.tgz#202bc30826d644d35eb96455bb23a982a5dd04b2"
+  integrity sha512-UeuYOqW3ZzUQfwb/mb3GNZ2/DlVdh5mjJNmB/yFXgQr8/pwlVJ9I2w+AHPfRDzLshe7YpgUB4T1//qgbk6U87Q==
   dependencies:
     "@types/node" "*"
 
 "@types/xml2js@^0.4.11", "@types/xml2js@^0.4.8":
   version "0.4.12"
+  resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.4.12.tgz#d9aae03295476fd5cbc74e0b572816208dbec6d1"
+  integrity sha512-CZPpQKBZ8db66EP5hCjwvYrLThgZvnyZrPXK2W+UI1oOaWezGt34iOaUCX4Jah2X8+rQqjvl9VKEIT8TR1I0rA==
   dependencies:
     "@types/node" "*"
 
@@ -1168,7 +1173,7 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^4.0.0", "@typescript-eslint/parser@^4.31.2":
+"@typescript-eslint/parser@^4.31.2":
   version "4.33.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz"
   integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==
@@ -1234,7 +1239,7 @@
   resolved "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz"
   integrity sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA==
 
-"@vue/cli-service@^3.0.0 || ^4.0.0 || ^5.0.0-0", "@vue/cli-service@~5.0.8":
+"@vue/cli-service@~5.0.8":
   version "5.0.8"
   resolved "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz"
   integrity sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw==
@@ -1345,7 +1350,7 @@
   resolved "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"
   integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==
 
-"@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@1.11.6":
+"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
   version "1.11.6"
   resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz"
   integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
@@ -1446,7 +1451,7 @@
     "@webassemblyjs/wasm-gen" "1.11.6"
     "@webassemblyjs/wasm-parser" "1.11.6"
 
-"@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@1.11.6":
+"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
   version "1.11.6"
   resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz"
   integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
@@ -1491,6 +1496,14 @@
   resolved "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz"
   integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==
 
+JSONStream@^1.3.5:
+  version "1.3.5"
+  resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 abab@^2.0.3, abab@^2.0.5:
   version "2.0.6"
   resolved "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz"
@@ -1537,17 +1550,12 @@ acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1, acorn-walk@^8.2.0:
   resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^7.1.1:
+acorn@^7.1.1, acorn@^7.4.0:
   version "7.4.1"
   resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8, acorn@^8.0.4, acorn@^8.0.5, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2:
+acorn@^8.0.4, acorn@^8.0.5, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2:
   version "8.10.0"
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
@@ -1599,7 +1607,7 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1609,17 +1617,7 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.8.2, ajv@^8.9.0:
-  version "8.12.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ajv@^8.0.1:
+ajv@^8.0.0, ajv@^8.0.1, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -1641,16 +1639,16 @@ amqplib@^0.8.0:
     safe-buffer "~5.2.1"
     url-parse "~1.5.1"
 
-ansi-colors@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"
-  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
-
 ansi-colors@4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
+ansi-colors@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"
+  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
+
 ansi-escapes@^3.0.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"
@@ -1759,16 +1757,16 @@ array-find-index@^1.0.1:
   resolved "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"
   integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==
 
-array-flatten@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
+array-flatten@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
@@ -1948,6 +1946,8 @@ binary-extensions@^2.0.0:
 
 bindings@~1.2.1:
   version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
+  integrity sha512-u4cBQNepWxYA55FunZSM7wMi55yQaN0otnhhilNoWHq0MfOfJeQx0v0mRRpolGOExPjZcl6FtB0BB8Xkb88F0g==
 
 bitsyntax@~0.1.0:
   version "0.1.0"
@@ -1989,13 +1989,13 @@ bn.js@^4.0.0:
   resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
-body-parser@^1.19.0:
-  version "1.20.2"
-  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"
-  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.5"
+    content-type "~1.0.4"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -2003,17 +2003,17 @@ body-parser@^1.19.0:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.2"
+    raw-body "2.5.1"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@^1.19.0:
+  version "1.20.2"
+  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -2021,7 +2021,7 @@ body-parser@1.20.1:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.1"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -2110,7 +2110,7 @@ browser-stdout@1.3.1:
   resolved "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, "browserslist@>= 4.21.0":
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9:
   version "4.21.10"
   resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz"
   integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
@@ -2264,7 +2264,9 @@ casbin-pg-adapter@^1.4.0:
     pg "^8.2.1"
 
 casbin@^5.0.4, casbin@^5.11.5:
-  version "5.27.0"
+  version "5.27.1"
+  resolved "https://registry.yarnpkg.com/casbin/-/casbin-5.27.1.tgz#ebebae1e0c555301c7e1ee83204863e9db0d3b1c"
+  integrity sha512-nAbUyMfeVasZDZ39/OX+Y8AzpiAGvhYI58l/3BKuDZSnqC+Rpja/DmcHPt0wcUgJxfMkG/yo0dCmMhnSXZq49A==
   dependencies:
     await-lock "^2.0.1"
     buffer "^6.0.3"
@@ -2297,16 +2299,7 @@ chai@^4.3.4:
     pathval "^1.1.1"
     type-detect "^4.0.5"
 
-chalk@^2.1.0:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.4.2:
+chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2341,7 +2334,7 @@ check-error@^1.0.2:
   resolved "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"
   integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
 
-chokidar@^3.5.2, chokidar@^3.5.3, chokidar@3.5.3:
+chokidar@3.5.3, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -2381,12 +2374,12 @@ class-transformer-validator@^0.9.1:
   resolved "https://registry.npmjs.org/class-transformer-validator/-/class-transformer-validator-0.9.1.tgz"
   integrity sha512-83/KFCyd6UiiwH6PlQS5y17O5TTx58CawvNI+XdrMs0Ig9QI5kiuzRqGcC/WrEpd1F7i4KIxCwdn6m4B6fl0jw==
 
-class-transformer@^0.5.1, class-transformer@>=0.2.3:
+class-transformer@^0.5.1:
   version "0.5.1"
   resolved "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz"
   integrity sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==
 
-class-validator@^0.14.0, class-validator@>=0.12.0:
+class-validator@^0.14.0:
   version "0.14.0"
   resolved "https://registry.npmjs.org/class-validator/-/class-validator-0.14.0.tgz"
   integrity sha512-ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A==
@@ -2450,7 +2443,7 @@ cli-spinners@^2.5.0:
   resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz"
   integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==
 
-cli-truncate@^2.1.0, cli-truncate@2.1.0:
+cli-truncate@2.1.0, cli-truncate@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"
   integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
@@ -2511,16 +2504,16 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-
 clone@2.x:
   version "2.1.2"
   resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
   integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
+  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
+
 cluster-key-slot@^1.1.0:
   version "1.1.2"
   resolved "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz"
@@ -2547,16 +2540,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@^1.0.0, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
+color-name@^1.0.0, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 color-string@^1.6.0:
   version "1.9.1"
   resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -2621,12 +2614,7 @@ commander@^7.2.0:
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
-commander@^8.2.0:
-  version "8.3.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
-commander@^8.3.0:
+commander@^8.2.0, commander@^8.3.0:
   version "8.3.0"
   resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
@@ -2825,18 +2813,7 @@ cross-os@^1.5.0:
   resolved "https://registry.npmjs.org/cross-os/-/cross-os-1.5.0.tgz"
   integrity sha512-zjiZPGuzghQzjcymlI7oUh5iDCRlhfi9UBqkCmqxnnx/5B+K1+BgIm0YU+fua7GC+RoeywS0qsoEavRM+Kahxw==
 
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^6.0.5:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2870,7 +2847,7 @@ css-declaration-sorter@^6.3.1:
   resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz"
   integrity sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==
 
-css-loader@*, css-loader@^6.5.0:
+css-loader@^6.5.0:
   version "6.8.1"
   resolved "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz"
   integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==
@@ -3087,35 +3064,7 @@ date-time@^3.1.0:
   dependencies:
     time-zone "^1.0.0"
 
-debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@~2.6.9:
-  version "2.6.9"
-  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@2.6.9:
+debug@2.6.9, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -3129,6 +3078,13 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@4.3.3:
   version "4.3.3"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"
@@ -3136,6 +3092,13 @@ debug@4.3.3:
   dependencies:
     ms "2.1.2"
 
+debug@^3.1.0, debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
@@ -3173,10 +3136,6 @@ deep-is@^0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-"deeplynx@file:/Users/darrjw/IdeaProjects/Deep-Lynx/NodeLibraries/deeplynx":
-  version "0.0.0"
-  resolved "file:NodeLibraries/deeplynx"
-
 deepmerge@^1.5.2:
   version "1.5.2"
   resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"
@@ -3218,16 +3177,16 @@ denque@^2.1.0:
   resolved "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"
   integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
 
+depd@2.0.0, depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
-depd@~2.0.0, depd@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
 destroy@1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
@@ -3243,16 +3202,16 @@ dev-null@^0.1.1:
   resolved "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz"
   integrity sha512-nMNZG0zfMgmdv8S5O0TM5cpwNbGKRGPCxVsr0SmA3NZZy9CYBbuNLL0PD3Acx9e5LIUgwONXtM9kM6RlawPxEQ==
 
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 diff@5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
 digest-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/digest-stream/-/digest-stream-2.0.0.tgz"
@@ -3398,7 +3357,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.4.477:
-  version "1.4.506"
+  version "1.4.528"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz#7c900fd73d9d2e8bb0dab0e301f25f0f4776ef2c"
+  integrity sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==
 
 emittery@^1.0.1:
   version "1.0.1"
@@ -3445,7 +3406,7 @@ enhanced-resolve@^5.15.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5, enquirer@^2.3.6, "enquirer@>= 2.3.0 < 3":
+enquirer@^2.3.5, enquirer@^2.3.6:
   version "2.4.1"
   resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz"
   integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==
@@ -3492,6 +3453,16 @@ escape-html@^1.0.3, escape-html@~1.0.3:
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
+escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+escape-string-regexp@5.0.0, escape-string-regexp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
+
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
@@ -3502,16 +3473,6 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escape-string-regexp@^4.0.0, escape-string-regexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-escape-string-regexp@^5.0.0, escape-string-regexp@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz"
-  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
-
 escodegen@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz"
@@ -3545,7 +3506,7 @@ eslint-plugin-security@^1.5.0:
   dependencies:
     safe-regex "^2.1.1"
 
-eslint-scope@^5.1.1, eslint-scope@5.1.1:
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -3567,12 +3528,7 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
@@ -3582,7 +3538,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint@*, "eslint@^5.0.0 || ^6.0.0 || ^7.0.0", eslint@^7.28.0, eslint@>=2.0.0, eslint@>=5, eslint@>=7.0.0:
+eslint@^7.28.0:
   version "7.32.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"
   integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
@@ -3704,22 +3660,7 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-execa@^5.1.1:
+execa@^5.0.0, execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -3957,12 +3898,20 @@ find-cache-dir@^3.2.0:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
+find-up@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
     path-exists "^4.0.0"
 
 find-up@^6.0.0:
@@ -3973,14 +3922,6 @@ find-up@^6.0.0:
     locate-path "^7.1.0"
     path-exists "^5.0.0"
 
-find-up@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 flat-cache@^3.0.4:
   version "3.1.0"
   resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz"
@@ -4048,13 +3989,15 @@ forwarded@0.2.0:
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fp-ts@^2.0.0, fp-ts@^2.11.3, fp-ts@^2.5.0:
+fp-ts@^2.11.3:
   version "2.16.1"
   resolved "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.1.tgz"
   integrity sha512-by7U5W8dkIzcvDofUcO42yl9JbnHTEDBrzu3pt5fKT+Z4Oy85I21K80EYJYdjQGC2qum4Vo55Ag57iiIK4FYuA==
 
 fraction.js@^4.2.0:
-  version "4.3.2"
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.6.tgz#e9e3acec6c9a28cf7bc36cbe35eea4ceb2c5c92d"
+  integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==
 
 fresh@0.5.2:
   version "0.5.2"
@@ -4167,27 +4110,27 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
-  version "7.2.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
+  version "7.2.3"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -4250,11 +4193,6 @@ graphql-type-json@^0.3.2:
   resolved "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz"
   integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==
 
-"graphql@^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0", "graphql@^14.7.0 || ^15.3.0", graphql@^15.6.0, graphql@>=0.8.0:
-  version "15.8.0"
-  resolved "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz"
-  integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==
-
 graphql@^14.5.3:
   version "14.7.0"
   resolved "https://registry.npmjs.org/graphql/-/graphql-14.7.0.tgz"
@@ -4262,6 +4200,11 @@ graphql@^14.5.3:
   dependencies:
     iterall "^1.2.2"
 
+graphql@^15.6.0:
+  version "15.8.0"
+  resolved "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz"
+  integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==
+
 gremlin@^3.4.10:
   version "3.7.0"
   resolved "https://registry.npmjs.org/gremlin/-/gremlin-3.7.0.tgz"
@@ -4350,7 +4293,7 @@ hasha@^5.0.0:
     is-stream "^2.0.0"
     type-fest "^0.8.0"
 
-he@^1.2.0, he@1.2.0:
+he@1.2.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -4480,27 +4423,6 @@ http-deceiver@^1.2.7:
   resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"
   integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
-  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-errors@~1.7.3:
-  version "1.7.3"
-  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
 http-errors@1.8.0:
   version "1.8.0"
   resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz"
@@ -4523,6 +4445,27 @@ http-errors@2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.3:
+  version "1.7.3"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-parser-js@>=0.5.1:
   version "0.5.8"
   resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
@@ -4659,7 +4602,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@2, inherits@2.0.4:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4684,7 +4627,7 @@ io-ts-types@^0.5.15:
   resolved "https://registry.npmjs.org/io-ts-types/-/io-ts-types-0.5.19.tgz"
   integrity sha512-kQOYYDZG5vKre+INIDZbLeDJe+oM+4zLpUkjXyTMyUfoCpjJNyi29ZLkuEAwcPufaYo3yu/BsemZtbdD+NtRfQ==
 
-io-ts@^2.0.0, io-ts@^2.2.16:
+io-ts@^2.2.16:
   version "2.2.20"
   resolved "https://registry.npmjs.org/io-ts/-/io-ts-2.2.20.tgz"
   integrity sha512-Rq2BsYmtwS5vVttie4rqrOCIfHCS9TgpRLFpKQCM1wZBBRY9nWVGmEvm2FnDbSE2un1UE39DvFpTR5UL47YDcA==
@@ -4704,16 +4647,16 @@ ioredis@^5.3.2:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
-ipaddr.js@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz"
-  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
-
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
+ipaddr.js@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz"
+  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
+
 irregular-plurals@^3.3.0:
   version "3.5.0"
   resolved "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz"
@@ -4956,16 +4899,16 @@ is-wsl@^2.1.1, is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
@@ -5090,6 +5033,13 @@ js-tokens@^4.0.0:
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 js-yaml@^3.13.1, js-yaml@^3.14.1:
   version "3.14.1"
   resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
@@ -5098,13 +5048,6 @@ js-yaml@^3.13.1, js-yaml@^3.14.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsdom@^16.6.0:
   version "16.7.0"
   resolved "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz"
@@ -5190,12 +5133,7 @@ json5@^1.0.1, json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.2.3"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
-json5@^2.2.3:
+json5@^2.1.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -5214,16 +5152,10 @@ jsonparse@^1.2.0:
   resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
-JSONStream@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
 jsonwebtoken@^9.0.0:
   version "9.0.2"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
+  integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
   dependencies:
     jws "^3.2.2"
     lodash.includes "^4.3.0"
@@ -5445,6 +5377,8 @@ lodash._stringtopath@~4.8.0:
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.defaults@^4.2.0:
   version "4.2.0"
@@ -5458,9 +5392,13 @@ lodash.defaultsdeep@^4.6.1:
 
 lodash.escape@^4.0.1:
   version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
+  integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==
 
 lodash.flatten@^4.4.0:
   version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
 
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
@@ -5469,9 +5407,13 @@ lodash.flattendeep@^4.4.0:
 
 lodash.includes@^4.3.0:
   version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
 
 lodash.invokemap@^4.6.0:
   version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz#1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62"
+  integrity sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==
 
 lodash.isarguments@^3.1.0:
   version "3.1.0"
@@ -5480,18 +5422,28 @@ lodash.isarguments@^3.1.0:
 
 lodash.isboolean@^3.0.3:
   version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
 
 lodash.isinteger@^4.0.4:
   version "4.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
+  integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==
 
 lodash.isnumber@^3.0.3:
   version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
 
 lodash.isstring@^4.0.1:
   version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
 
 lodash.mapvalues@^4.6.0:
   version "4.6.0"
@@ -5510,9 +5462,13 @@ lodash.merge@^4.6.2:
 
 lodash.once@^4.0.0:
   version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
+  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
 lodash.pullall@^4.2.0:
   version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.pullall/-/lodash.pullall-4.2.0.tgz#9d98b8518b7c965b0fae4099bd9fb7df8bbf38ba"
+  integrity sha512-VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg==
 
 lodash.truncate@^4.4.2:
   version "4.4.2"
@@ -5524,9 +5480,6 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash.uniqby@^4.7.0:
-  version "4.7.0"
-
 lodash.uniqby@4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz"
@@ -5535,12 +5488,17 @@ lodash.uniqby@4.5.0:
     lodash._baseiteratee "~4.7.0"
     lodash._baseuniq "~4.6.0"
 
+lodash.uniqby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
+  integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==
+
 lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.1.0, log-symbols@4.1.0:
+log-symbols@4.1.0, log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -5622,6 +5580,8 @@ lru-cache@^6.0.0:
 
 lzo@^0.4.0:
   version "0.4.11"
+  resolved "https://registry.yarnpkg.com/lzo/-/lzo-0.4.11.tgz#0e76d582567b29e285cb84a6aa392cb94c6283f8"
+  integrity sha512-apQHNoW2Alg72FMqaC/7pn03I7umdgSVFt2KRkCXXils4Z9u3QBh1uOtl2O5WmZIDLd9g6Lu4lIdOLmiSTFVCQ==
   dependencies:
     bindings "~1.2.1"
 
@@ -5735,7 +5695,7 @@ micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-"mime-db@>= 1.43.0 < 2", mime-db@1.52.0:
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
@@ -5779,6 +5739,13 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
+minimatch@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz"
+  integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
@@ -5793,13 +5760,6 @@ minimatch@^7.4.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@4.2.1:
-  version "4.2.1"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz"
-  integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
@@ -5807,6 +5767,8 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
 
 minio@^7.1.2:
   version "7.1.3"
+  resolved "https://registry.yarnpkg.com/minio/-/minio-7.1.3.tgz#86dc95f3671045d6956920db757bb63f25bf20ee"
+  integrity sha512-xPrLjWkTT5E7H7VnzOjF//xBp9I40jYB4aWhb2xTFopXXfw+Wo82DDWngdUju7Doy3Wk7R8C4LAgwhLHHnf0wA==
   dependencies:
     async "^3.2.4"
     block-stream2 "^2.1.0"
@@ -5882,7 +5844,7 @@ module-alias@^2.2.2:
   resolved "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz"
   integrity sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==
 
-monocle-ts@^2.0.0, monocle-ts@^2.3.11:
+monocle-ts@^2.3.11:
   version "2.3.13"
   resolved "https://registry.npmjs.org/monocle-ts/-/monocle-ts-2.3.13.tgz"
   integrity sha512-D5Ygd3oulEoAm3KuGO0eeJIrhFf1jlQIoEVV2DYsZUMz42j4tGxgct97Aq68+F8w4w4geEnwFa8HayTS/7lpKQ==
@@ -5892,11 +5854,6 @@ mrmime@^1.0.0:
   resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"
   integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
 
-ms@^2.1.1, ms@^2.1.3, ms@2.1.3:
-  version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
@@ -5907,6 +5864,11 @@ ms@2.1.2:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multicast-dns@^7.2.5:
   version "7.2.5"
   resolved "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz"
@@ -5929,16 +5891,16 @@ nanoclone@^0.2.1:
   resolved "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz"
   integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
 
-nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
-
 nanoid@3.3.1:
   version "3.3.1"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"
   integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
 
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
@@ -5954,7 +5916,7 @@ neo-async@^2.6.2:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-newtype-ts@^0.3.2, newtype-ts@^0.3.4:
+newtype-ts@^0.3.4:
   version "0.3.5"
   resolved "https://registry.npmjs.org/newtype-ts/-/newtype-ts-0.3.5.tgz"
   integrity sha512-v83UEQMlVR75yf1OUdoSFssjitxzjZlqBAjiGQ4WJaML8Jdc68LJ+BaSAXUmKY4bNzp7hygkKLYTsDi14PxI2g==
@@ -6455,16 +6417,16 @@ parse5-htmlparser2-tree-adapter@^6.0.0:
   dependencies:
     parse5 "^6.0.1"
 
+parse5@6.0.1, parse5@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+
 parse5@^5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"
   integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
-parse5@^6.0.1, parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
-
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
@@ -6505,7 +6467,7 @@ passport-local@^1.0.0:
   dependencies:
     passport-strategy "1.x.x"
 
-passport-strategy@^1.0.0, passport-strategy@1.x.x:
+passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"
   integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==
@@ -6539,12 +6501,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
   integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
-path-key@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-key@^3.1.0:
+path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -6664,7 +6621,7 @@ pg-types@^4.0.1:
     postgres-interval "^3.0.0"
     postgres-range "^1.1.1"
 
-pg@^8, pg@^8.2.1, pg@^8.7.1, pg@^8.8.0, pg@>=2.7.0, "pg@>=4.3.0 <9.0.0", pg@>=8.0:
+pg@^8.2.1, pg@^8.7.1, pg@^8.8.0:
   version "8.11.3"
   resolved "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz"
   integrity sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==
@@ -6986,15 +6943,6 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-"postcss@^7.0.0 || ^8.0.1", postcss@^8.0.9, postcss@^8.1.0, postcss@^8.2.15, postcss@^8.2.2, postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.21:
-  version "8.4.29"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz"
-  integrity sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==
-  dependencies:
-    nanoid "^3.3.6"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
 postcss@^7.0.36:
   version "7.0.39"
   resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
@@ -7003,6 +6951,15 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
+postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.21:
+  version "8.4.29"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz"
+  integrity sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==
+  dependencies:
+    nanoid "^3.3.6"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 postgres-array@~2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"
@@ -7057,16 +7014,16 @@ prelude-ls@^1.2.1:
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-"prettier@^1.18.2 || ^2.0.0":
-  version "2.8.8"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"
-  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
-
 prettier@2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz"
   integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==
 
+"prettier@^1.18.2 || ^2.0.0":
+  version "2.8.8"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+
 pretty-error@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz"
@@ -7203,20 +7160,20 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@^2.4.1, raw-body@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"
-  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+raw-body@2.5.2, raw-body@^2.4.1:
+  version "2.5.2"
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"
@@ -7242,20 +7199,17 @@ read-pkg@^5.1.1, read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@^2.0.1:
-  version "2.3.8"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+"readable-stream@1.x >=1.1.9":
+  version "1.1.14"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
+  integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
   dependencies:
     core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
 
-readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@3:
+readable-stream@3, readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -7264,17 +7218,7 @@ readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0, readable
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~1.0.31:
-  version "1.0.34"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -7287,10 +7231,10 @@ readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-"readable-stream@1.x >=1.1.9":
-  version "1.1.14"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
-  integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
+readable-stream@~1.0.31:
+  version "1.0.34"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
+  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -7495,25 +7439,15 @@ rxjs@^7.5.1:
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@>=5.1.0, safe-buffer@~5.2.0, safe-buffer@~5.2.1, safe-buffer@5.2.1:
-  version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@~5.1.2:
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1, safe-buffer@~5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.1.2:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0, safe-buffer@~5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-regex@^2.1.1:
   version "2.1.1"
@@ -7532,12 +7466,12 @@ safe-timers@^1.1.0:
   resolved "https://registry.npmjs.org/safe-timers/-/safe-timers-1.1.0.tgz"
   integrity sha512-9aqY+v5eMvmRaluUEtdRThV1EjlSElzO7HuCj0sTW9xvp++8iJ9t/RWGNWV6/WHcUJLHpyT2SNf/apoKTU2EpA==
 
-safer-buffer@^2.1.0, "safer-buffer@>= 2.1.2 < 3", safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sax@^1.2.4, sax@>=0.6.0:
+sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -7585,27 +7519,12 @@ semver-compare@^1.0.0:
   resolved "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.7.1:
   version "5.7.2"
   resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^5.7.1:
-  version "5.7.2"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-semver@^6.0.0:
-  version "6.3.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^6.3.0:
-  version "6.3.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^6.3.1:
+semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -7622,11 +7541,6 @@ semver@~7.0.0:
   resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-"semver@2 || 3 || 4 || 5":
-  version "5.7.2"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
@@ -7653,13 +7567,6 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"
-  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
-  dependencies:
-    randombytes "^2.1.0"
-
 serialize-javascript@6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"
@@ -7667,6 +7574,13 @@ serialize-javascript@6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"
+  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"
@@ -7806,6 +7720,8 @@ simple-update-notifier@^1.0.7:
 
 sirv@^2.0.3:
   version "2.0.3"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.3.tgz#ca5868b87205a74bef62a469ed0296abceccd446"
+  integrity sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==
   dependencies:
     "@polka/url" "^1.0.0-next.20"
     mrmime "^1.0.0"
@@ -7989,21 +7905,16 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-"statuses@>= 1.4.0 < 2":
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-
-"statuses@>= 1.5.0 < 2":
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
+
 stream-transform@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/stream-transform/-/stream-transform-2.1.3.tgz"
@@ -8021,25 +7932,6 @@ strict-uri-encode@^2.0.0:
   resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"
   integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 string-argv@0.3.1:
   version "0.3.1"
   resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"
@@ -8071,6 +7963,25 @@ string-width@^5.0.0:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 stringify-object@3.3.0:
   version "3.3.0"
   resolved "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"
@@ -8128,7 +8039,7 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1, strip-json-comments@3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -8156,14 +8067,14 @@ supertap@^3.0.1:
     serialize-error "^7.0.1"
     strip-ansi "^7.0.1"
 
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+supports-color@8.1.1, supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
 
-supports-color@^5.5.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -8177,20 +8088,6 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@8.1.1:
-  version "8.1.1"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
@@ -8309,11 +8206,6 @@ thrift@^0.11.0:
     q "^1.5.0"
     ws ">= 2.2.3"
 
-through@^2.3.8, "through@>=2.2.7 <3":
-  version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
 through2@^2.0.1:
   version "2.0.5"
   resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
@@ -8329,6 +8221,11 @@ through2@^4.0.2:
   dependencies:
     readable-stream "3"
 
+"through@>=2.2.7 <3", through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"
@@ -8368,6 +8265,8 @@ toposort@^2.0.2:
 
 totalist@^3.0.0:
   version "3.0.1"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
 touch@^3.1.0:
   version "3.1.0"
@@ -8511,7 +8410,7 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.7.2, typescript@>=2.7, "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta":
+typescript@^4.7.2:
   version "4.9.5"
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
@@ -8526,7 +8425,7 @@ uid-generator@^2.0.0:
   resolved "https://registry.npmjs.org/uid-generator/-/uid-generator-2.0.0.tgz"
   integrity sha512-XLRw2UyViQueSbd3dOHkswrg4gA4YuhibKzkFiPkilo6cdKEQqOX3K/Yu6Z2WXVMK+npfMNlSSufVSUifbXoOQ==
 
-uid-safe@~2.1.5, uid-safe@2.1.5:
+uid-safe@2.1.5, uid-safe@~2.1.5:
   version "2.1.5"
   resolved "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"
   integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==
@@ -8548,7 +8447,7 @@ universalify@^2.0.0:
   resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-unpipe@~1.0.0, unpipe@1.0.0:
+unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
@@ -8602,7 +8501,7 @@ utila@~0.4:
   resolved "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"
   integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==
 
-utils-merge@^1.0.1, utils-merge@1.0.1:
+utils-merge@1.0.1, utils-merge@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
@@ -8739,6 +8638,8 @@ webidl-conversions@^6.1.0:
 
 webpack-bundle-analyzer@^4.4.0:
   version "4.9.1"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz#d00bbf3f17500c10985084f22f1a2bf45cb2f09d"
+  integrity sha512-jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -8821,7 +8722,7 @@ webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-sources@*, webpack-sources@^3.2.3:
+webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
@@ -8831,7 +8732,7 @@ webpack-virtual-modules@^0.4.2:
   resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz"
   integrity sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==
 
-"webpack@^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.54.0:
+webpack@^5.54.0:
   version "5.88.2"
   resolved "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz"
   integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
@@ -8861,7 +8762,7 @@ webpack-virtual-modules@^0.4.2:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-websocket-driver@^0.7.4, websocket-driver@>=0.5.1:
+websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
   resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
   integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
@@ -8930,6 +8831,13 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.2:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
+which@2.0.2, which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
@@ -8937,13 +8845,6 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1, which@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 wildcard@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz"
@@ -8958,7 +8859,7 @@ winston-transport@^4.5.0:
     readable-stream "^3.6.0"
     triple-beam "^1.3.0"
 
-winston@^3.3.3, "winston@>=3.x <4":
+winston@^3.3.3:
   version "3.10.0"
   resolved "https://registry.npmjs.org/winston/-/winston-3.10.0.tgz"
   integrity sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g==
@@ -9034,21 +8935,16 @@ write-file-atomic@^5.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^4.0.1"
 
-ws@^7.3.1:
-  version "7.5.9"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+"ws@>= 2.2.3", ws@^8.11.0, ws@^8.13.0, ws@^8.9.0:
+  version "8.13.0"
+  resolved "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
-ws@^7.4.6:
+ws@^7.3.1, ws@^7.4.6:
   version "7.5.9"
   resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
-ws@^8.11.0, ws@^8.13.0, ws@^8.9.0, "ws@>= 2.2.3":
-  version "8.13.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
-
 x-xss-protection@1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz"
@@ -9096,11 +8992,6 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xml@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz"
-  integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==
-
 xml2js@^0.5.0:
   version "0.5.0"
   resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz"
@@ -9109,6 +9000,11 @@ xml2js@^0.5.0:
     sax ">=0.6.0"
     xmlbuilder "~11.0.0"
 
+xml@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz"
+  integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==
+
 xmlbuilder@^15.1.1:
   version "15.1.1"
   resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz"
@@ -9169,6 +9065,11 @@ yaml@^1.10.0, yaml@^1.10.2:
   resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yargs-parser@20.2.4:
+  version "20.2.4"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
 yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
@@ -9187,11 +9088,6 @@ yargs-parser@^21.1.1:
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@20.2.4:
-  version "20.2.4"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
-
 yargs-unparser@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"
@@ -9202,6 +9098,19 @@ yargs-unparser@2.0.0:
     flat "^5.0.2"
     is-plain-obj "^2.1.0"
 
+yargs@16.2.0, yargs@^16.0.0, yargs@^16.1.0, yargs@~16.2.0:
+  version "16.2.0"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yargs@^15.0.2:
   version "15.4.1"
   resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
@@ -9219,19 +9128,6 @@ yargs@^15.0.2:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^16.0.0, yargs@^16.1.0, yargs@~16.2.0, yargs@16.2.0:
-  version "16.2.0"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
 yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"