diff --git a/src/db/build/LeafDB.Schema.sql b/src/db/build/LeafDB.Schema.sql
index 6371cfa70..988f11579 100644
--- a/src/db/build/LeafDB.Schema.sql
+++ b/src/db/build/LeafDB.Schema.sql
@@ -1364,6 +1364,43 @@ CREATE TABLE [rela].[QueryConceptDependency](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
+/****** Object:  Table [auth].[UserRole]    Script Date: ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [auth].[UserRole](
+	[ScopedIdentity] [nvarchar](200) NOT NULL,
+    [IsUser] [bit] NOT NULL,
+    [IsAdmin] [bit] NOT NULL,
+    [IsSuper] [bit] NOT NULL,
+    [IsIdentified] [bit] NOT NULL,
+    [IsFederated] [bit] NOT NULL,
+    [Created] datetime NOT NULL,
+    [Updated] datetime NOT NULL
+ CONSTRAINT [PK__UserRole] PRIMARY KEY CLUSTERED 
+(
+	[ScopedIdentity] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] 
+GO
+/****** Object:  Table [auth].[UserGroup]    Script Date: ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [auth].[UserGroup](
+	[ScopedIdentity] [nvarchar](200) NOT NULL,
+    [GroupName] [nvarchar](200) NOT NULL,
+    [Created] datetime NOT NULL,
+    [Updated] datetime NOT NULL
+ CONSTRAINT [PK__UserGroup] PRIMARY KEY CLUSTERED 
+(
+	[ScopedIdentity] ASC,
+    [GroupName] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] 
+GO
 /****** Object:  Table [rela].[QueryDependency]    Script Date: ******/
 SET ANSI_NULLS ON
 GO
@@ -9061,9 +9098,32 @@ BEGIN
 
     EXEC network.sp_GetEndpoints;
 END
+GO
 
 
+-- =======================================
+-- Author:      Nic Dobbins
+-- Create date: 2021/10/19
+-- Description: Gets user roles
+-- =======================================
+CREATE PROCEDURE [auth].[sp_GetUserGroupsAndRoles]
+    @scopedId nvarchar(200)
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    -- Roles
+    SELECT IsUser, IsAdmin, IsSuper, IsIdentified, IsFederated
+    FROM [auth].[UserRole] AS R
+    WHERE R.ScopedIdentity = @scopedId
 
+    -- Groups
+    SELECT GroupName
+    FROM [auth].[UserGroup] AS G
+    WHERE G.ScopedIdentity = @scopedId
+
+END
+GO
 
 
 
diff --git a/src/db/migration/3.11.1__3.11.2.sql b/src/db/migration/3.11.1__3.11.2.sql
index 84a7f1b8a..d5ffa31dc 100644
--- a/src/db/migration/3.11.1__3.11.2.sql
+++ b/src/db/migration/3.11.1__3.11.2.sql
@@ -12,12 +12,17 @@ IF COLUMNPROPERTY(OBJECT_ID('app.DemographicQuery'), 'ColumnNamesJson', 'ColumnI
 BEGIN
     ALTER TABLE app.DemographicQuery 
     ADD [ColumnNamesJson] NVARCHAR(MAX) NULL
+END  
+GO
 
+IF (SELECT ColumnNamesJson FROM app.DemographicQuery) IS NULL
+BEGIN
     UPDATE app.DemographicQuery
-    SET [ColumnNamesJson] = '{}'
+	SET [ColumnNamesJson] = '{}'
 END  
 GO
 
+
 /**
  * Add [IsDefault] to app.DatasetQuery
  */
@@ -25,7 +30,11 @@ IF COLUMNPROPERTY(OBJECT_ID('app.DatasetQuery'), 'IsDefault', 'ColumnId') IS NUL
 BEGIN
     ALTER TABLE app.DatasetQuery 
     ADD [IsDefault] BIT NULL
+END  
+GO
 
+IF (SELECT COUNT(*) FROM app.DatasetQuery WHERE IsDefault IS NULL) > 0
+BEGIN
     UPDATE app.DatasetQuery
     SET [IsDefault] = 0
 END  
diff --git a/src/db/migration/3.11.2__3.11.3.sql b/src/db/migration/3.11.2__3.11.3.sql
new file mode 100644
index 000000000..90cf36b6f
--- /dev/null
+++ b/src/db/migration/3.11.2__3.11.3.sql
@@ -0,0 +1,6 @@
+/**
+ * Update version
+ */
+UPDATE ref.[Version]
+SET [Version] = '3.11.3'
+GO
\ No newline at end of file
diff --git a/src/server/API/API.csproj b/src/server/API/API.csproj
index 46ebff3c8..aa0111a2b 100644
--- a/src/server/API/API.csproj
+++ b/src/server/API/API.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> -->
     <TieredCompilation>true</TieredCompilation>
     <ReleaseVersion>3.1</ReleaseVersion>
@@ -27,13 +27,13 @@
     <Folder Include="DTO\Notification\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.App">
@@ -41,8 +41,8 @@
       <Publish Condition="'%(PackageReference.Version)' == ''">true</Publish>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.7.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.7.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.29.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.29.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.18" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
   </ItemGroup>
diff --git a/src/server/API/Controllers/ConfigController.cs b/src/server/API/Controllers/ConfigController.cs
index 635aa6f94..50277b017 100644
--- a/src/server/API/Controllers/ConfigController.cs
+++ b/src/server/API/Controllers/ConfigController.cs
@@ -63,8 +63,15 @@ public ActionResult<ConfigDTO> Get()
                 Attestation = new AttestationConfigDTO
                 {
                     Enabled = attestationOptions.Enabled,
+                    SkipModeSelection = attestationOptions.SkipModeSelection,
                     Text = attestationOptions.Text,
-                    Type = attestationOptions.Type
+                    Type = attestationOptions.Type,
+                    Credits = new AttestationConfigDTO.AttestationCreditsDTO
+                    {
+                        Enabled = attestationOptions.Credits.Enabled,
+                        Logos = attestationOptions.Credits.Logos,
+                        Text = attestationOptions.Credits.Text
+                    }
                 },
                 Cohort = new CohortConfigDTO
                 {
diff --git a/src/server/API/DTO/Config/ConfigDTO.cs b/src/server/API/DTO/Config/ConfigDTO.cs
index 6bc9c9d0b..41fec882f 100644
--- a/src/server/API/DTO/Config/ConfigDTO.cs
+++ b/src/server/API/DTO/Config/ConfigDTO.cs
@@ -52,8 +52,18 @@ public class CohortConfigDTO
     public class AttestationConfigDTO
     {
         public bool Enabled { get; set; }
+        public bool SkipModeSelection { get; set; }
         public string[] Text { get; set; }
         public CustomAttestationType Type { get; set; }
+
+        public AttestationCreditsDTO Credits { get; set; }
+
+        public class AttestationCreditsDTO
+        {
+            public bool Enabled { get; set; }
+            public string[] Logos { get; set; }
+            public string Text { get; set; }
+        }
     }
 
     public class ClientOptionsDTO
diff --git a/src/server/API/Options/Config.Attestation.cs b/src/server/API/Options/Config.Attestation.cs
index f0ac2cfec..0a73a4ebb 100644
--- a/src/server/API/Options/Config.Attestation.cs
+++ b/src/server/API/Options/Config.Attestation.cs
@@ -15,6 +15,14 @@ public static class Attestation
             public const string Enabled = @"Attestation:Enabled";
             public const string Type = @"Attestation:Type";
             public const string Text = @"Attestation:Text";
+            public const string SkipModeSelection = "Attestation:SkipModeSelection";
+
+            public static class Credits
+            {
+                public const string Enabled = @"Attestation:Credits:Enabled";
+                public const string Text = @"Attestation:Credits:Text";
+                public const string Logos = @"Attestation:Credits:Logos";
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/server/API/Options/StartupExtensions.Options.cs b/src/server/API/Options/StartupExtensions.Options.cs
index 1f7d7aecc..2b69d0de9 100644
--- a/src/server/API/Options/StartupExtensions.Options.cs
+++ b/src/server/API/Options/StartupExtensions.Options.cs
@@ -162,17 +162,29 @@ static IServiceCollection ConfigureAttestationOptions(this IServiceCollection se
 
             if (attest.Enabled)
             {
+                attest.SkipModeSelection = config.GetValue<bool>(Config.Attestation.SkipModeSelection);
                 attest.WithAttestationType(config.GetValue<string>(Config.Attestation.Type));
                 if (attest.Type != CustomAttestationType.None)
                 {
                     attest.Text = config.GetSection(Config.Attestation.Text).Get<string[]>();
                 }
             }
+
+            var hasCredits = config.TryGetValue<bool>(Config.Attestation.Credits.Enabled, out bool creditsEnabled);
+            if (hasCredits && creditsEnabled)
+            {
+                attest.Credits.Enabled = true;
+                attest.Credits.Text = config.GetValue<string>(Config.Attestation.Credits.Text);
+                attest.Credits.Logos = config.GetSection(Config.Attestation.Credits.Logos).Get<string[]>();
+            }
+
             services.Configure<AttestationOptions>(opts =>
             {
                 opts.Enabled = attest.Enabled;
+                opts.SkipModeSelection = attest.SkipModeSelection;
                 opts.Text = attest.Text;
                 opts.Type = attest.Type;
+                opts.Credits = attest.Credits;
             });
 
             return services;
diff --git a/src/server/API/appsettings.json b/src/server/API/appsettings.json
index 7adb3809b..7200af4ef 100644
--- a/src/server/API/appsettings.json
+++ b/src/server/API/appsettings.json
@@ -58,7 +58,7 @@
     }
   },
   "Attestation": {
-    "Enabled": false
+    "Enabled": true
   },
   "Compiler": {
     "Alias": "@",
diff --git a/src/server/Directory.Build.props b/src/server/Directory.Build.props
index a81c6ec12..6a6fa3ff7 100644
--- a/src/server/Directory.Build.props
+++ b/src/server/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.11.2</VersionPrefix>
+    <VersionPrefix>3.11.3</VersionPrefix>
   </PropertyGroup>
 </Project>
diff --git a/src/server/Model/Compiler/SqlBuilder/ConceptDatasetSqlSet.cs b/src/server/Model/Compiler/SqlBuilder/ConceptDatasetSqlSet.cs
index aba3ae993..409345290 100644
--- a/src/server/Model/Compiler/SqlBuilder/ConceptDatasetSqlSet.cs
+++ b/src/server/Model/Compiler/SqlBuilder/ConceptDatasetSqlSet.cs
@@ -41,7 +41,7 @@ internal override void SetSelect()
             var encounterId = new ExpressedColumn(
                 new Expression(dialect.Convert(ColumnType.String, EncounterId)),
                 EncounterColumns.EncounterId);
-            var dateField = new ExpressedColumn(Date, ConceptColumns.DateField);
+            var dateField = new ExpressedColumn(new Expression(Date), ConceptColumns.DateField);
 
             cols.Add(personId);
             cols.Add(encounterId);
@@ -49,7 +49,7 @@ internal override void SetSelect()
 
             if (PanelItem != null && PanelItem.UseNumericFilter)
             {
-                var numericField = new ExpressedColumn(Number, ConceptColumns.NumberField);
+                var numericField = new ExpressedColumn(new Expression(Number), ConceptColumns.NumberField);
                 cols.Add(numericField);
             }
 
@@ -73,7 +73,7 @@ public CachedCohortSqlSet(CompilerOptions compilerOptions)
         {
             Select = new ISelectable[]
             {
-                new ExpressedColumn(PersonId, DatasetColumns.PersonId),
+                new ExpressedColumn(new Expression(PersonId), DatasetColumns.PersonId),
                 Salt
             };
             From = $"{compilerOptions.AppDb}.app.Cohort";
diff --git a/src/server/Model/Compiler/SqlBuilder/DatasetJoinedSqlSet.cs b/src/server/Model/Compiler/SqlBuilder/DatasetJoinedSqlSet.cs
index 94a186b77..f9a703672 100644
--- a/src/server/Model/Compiler/SqlBuilder/DatasetJoinedSqlSet.cs
+++ b/src/server/Model/Compiler/SqlBuilder/DatasetJoinedSqlSet.cs
@@ -35,8 +35,8 @@ public DatasetJoinedSqlSet(
 
             Select = new ISelectable[] 
             { 
-                new ExpressedColumn(last.PersonId, DatasetColumns.PersonId),
-                new ExpressedColumn(last.EncounterId, EncounterColumns.EncounterId), 
+                new ExpressedColumn(new Expression(last.PersonId), DatasetColumns.PersonId),
+                new ExpressedColumn(new Expression(last.EncounterId), EncounterColumns.EncounterId), 
                 join.Salt 
             };
             From    = From.Prepend(join);
diff --git a/src/server/Model/Compiler/SqlBuilder/DatasetNonAggregateJoinedSqlSet.cs b/src/server/Model/Compiler/SqlBuilder/DatasetNonAggregateJoinedSqlSet.cs
index df2691959..4e0adb7d2 100644
--- a/src/server/Model/Compiler/SqlBuilder/DatasetNonAggregateJoinedSqlSet.cs
+++ b/src/server/Model/Compiler/SqlBuilder/DatasetNonAggregateJoinedSqlSet.cs
@@ -40,7 +40,7 @@ public DatasetNonAggregateJoinedSqlSet(
                 new ExpressedColumn(
                     new Expression(dialect.Convert(ColumnType.String, last.EncounterId)),
                     EncounterColumns.EncounterId),
-                new ExpressedColumn(last.Date, ConceptColumns.DateField),
+                new ExpressedColumn(new Expression(last.Date), ConceptColumns.DateField),
                 join.Salt
             };
             From = From.Prepend(join);
diff --git a/src/server/Model/Compiler/SqlBuilder/Dialect.cs b/src/server/Model/Compiler/SqlBuilder/Dialect.cs
index 0cc9d9e31..e20a01268 100644
--- a/src/server/Model/Compiler/SqlBuilder/Dialect.cs
+++ b/src/server/Model/Compiler/SqlBuilder/Dialect.cs
@@ -41,8 +41,8 @@ public static class Field
 
         public static class Alias
         {
-            public const string Person = "_S";
-            public const string Sequence = "_T";
+            public const string Person = "S";
+            public const string Sequence = "T";
         }
 
         public static class Syntax
diff --git a/src/server/Model/Model.csproj b/src/server/Model/Model.csproj
index 95175e2a8..2090fb0ad 100644
--- a/src/server/Model/Model.csproj
+++ b/src/server/Model/Model.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> -->
     <TieredCompilation>true</TieredCompilation>
-    <ReleaseVersion>3.1</ReleaseVersion>
+    <ReleaseVersion>6.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
@@ -20,9 +20,9 @@
     <Folder Include="Admin\Notification\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Composure" Version="1.1.0" />
+    <PackageReference Include="Composure" Version="1.3.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="Compiler\appsettings.json" />
diff --git a/src/server/Model/Options/AttestationOptions.cs b/src/server/Model/Options/AttestationOptions.cs
index f5e6cf419..1611f58e2 100644
--- a/src/server/Model/Options/AttestationOptions.cs
+++ b/src/server/Model/Options/AttestationOptions.cs
@@ -12,11 +12,14 @@ namespace Model.Options
     public class AttestationOptions
     {
         public bool Enabled { get; set; }
+        public bool SkipModeSelection { get; set; }
         public string[] Text { get; set; }
 
         public const string TextType = "TEXT";
         public const string HtmlType = "HTML";
 
+        public CreditsOptions Credits = new CreditsOptions();
+
         public CustomAttestationType Type { get; set; }
         public static readonly IEnumerable<string> ValidTypeOptions = new string[] { TextType, HtmlType };
 
@@ -46,6 +49,13 @@ public void WithAttestationType(string value)
                     break;
             }
         }
+
+        public class CreditsOptions
+        {
+            public bool Enabled { get; set; }
+            public string Text { get; set; }
+            public string[] Logos { get; set; }
+        }
     }
 
     public enum CustomAttestationType : ushort
diff --git a/src/server/Services/Admin/Compiler/AdminDemographicQueryService.cs b/src/server/Services/Admin/Compiler/AdminDemographicQueryService.cs
index c78349448..f7cfaf925 100644
--- a/src/server/Services/Admin/Compiler/AdminDemographicQueryService.cs
+++ b/src/server/Services/Admin/Compiler/AdminDemographicQueryService.cs
@@ -45,7 +45,12 @@ public async Task<AdminDemographicQuery> GetDemographicQueryAsync()
                     commandType: CommandType.StoredProcedure,
                     commandTimeout: opts.DefaultTimeout);
 
-                return demo.ToAdminDemographicQuery();
+                if (demo != null) return demo.ToAdminDemographicQuery();
+                return new AdminDemographicQuery
+                {
+                    SqlStatement = "",
+                    ColumnNames = new Dictionary<string, string>()
+                };
             }
         }
 
diff --git a/src/server/Services/Services.csproj b/src/server/Services/Services.csproj
index 1f735502d..6d43c58f5 100644
--- a/src/server/Services/Services.csproj
+++ b/src/server/Services/Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> -->
     <TieredCompilation>true</TieredCompilation>
     <ReleaseVersion>3.1</ReleaseVersion>
@@ -15,7 +15,7 @@
     <PackageReference Include="Dapper" Version="1.60.6" />
     <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="4.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/src/server/Tests/Tests.csproj b/src/server/Tests/Tests.csproj
index 0c82d4088..f8e3e1c30 100644
--- a/src/server/Tests/Tests.csproj
+++ b/src/server/Tests/Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> -->
     <TieredCompilation>true</TieredCompilation>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
-    <ReleaseVersion>3.1</ReleaseVersion>
+    <ReleaseVersion>6.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ui-client/package-lock.json b/src/ui-client/package-lock.json
index afd2d41d5..6c38d5636 100644
--- a/src/ui-client/package-lock.json
+++ b/src/ui-client/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ui-client",
-  "version": "3.11.1",
+  "version": "3.11.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3683,16 +3683,47 @@
         }
       }
     },
+    "@types/d3-array": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.4.tgz",
+      "integrity": "sha512-nwvEkG9vYOc0Ic7G7kwgviY4AQlTfYGIZ0fqB7CQHXGyYM6nO7kJh5EguSNA3jfh4rq7Sb7eMVq8isuvg2/miQ=="
+    },
+    "@types/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA=="
+    },
+    "@types/d3-ease": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.0.tgz",
+      "integrity": "sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA=="
+    },
     "@types/d3-format": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-1.4.2.tgz",
       "integrity": "sha512-WeGCHAs7PHdZYq6lwl/+jsl+Nfc1J2W1kNcMeIMYzQsT6mtBDBgtJ/rcdjZ0k0rVIvqEZqhhuD5TK/v3P2gFHQ=="
     },
+    "@types/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==",
+      "requires": {
+        "@types/d3-color": "*"
+      }
+    },
     "@types/d3-path": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-1.0.9.tgz",
       "integrity": "sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ=="
     },
+    "@types/d3-scale": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.3.tgz",
+      "integrity": "sha512-PATBiMCpvHJSMtZAMEhc2WyL+hnzarKzI6wAHYjhsonjWJYGq5BXTzQjv4l8m2jO183/4wZ90rKvSeT7o72xNQ==",
+      "requires": {
+        "@types/d3-time": "*"
+      }
+    },
     "@types/d3-shape": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-1.3.8.tgz",
@@ -3701,6 +3732,16 @@
         "@types/d3-path": "^1"
       }
     },
+    "@types/d3-time": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz",
+      "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg=="
+    },
+    "@types/d3-timer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
+      "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g=="
+    },
     "@types/eslint": {
       "version": "8.4.6",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
@@ -4362,152 +4403,6 @@
         "eslint-visitor-keys": "^3.3.0"
       }
     },
-    "@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -5793,7 +5688,8 @@
     "core-js": {
       "version": "3.25.1",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.1.tgz",
-      "integrity": "sha512-sr0FY4lnO1hkQ4gLDr24K0DGnweGO1QwSj5BpfQjpSJPdqWalja4cTps29Y/PJVG/P7FYlPDkH3hO+Tr0CvDgQ=="
+      "integrity": "sha512-sr0FY4lnO1hkQ4gLDr24K0DGnweGO1QwSj5BpfQjpSJPdqWalja4cTps29Y/PJVG/P7FYlPDkH3hO+Tr0CvDgQ==",
+      "dev": true
     },
     "core-js-compat": {
       "version": "3.25.1",
@@ -6051,6 +5947,11 @@
         "source-map": "^0.6.1"
       }
     },
+    "css-unit-converter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
+      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA=="
+    },
     "css-what": {
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
@@ -6179,74 +6080,82 @@
       "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
     },
     "d3-array": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
-      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.3.tgz",
+      "integrity": "sha512-JRHwbQQ84XuAESWhvIPaUV4/1UYTBOLiOPGWqgFDHZS1D5QN9c57FbH3QpEnQMYiOXNzKUQyGTZf+EVO7RT5TQ==",
       "requires": {
-        "internmap": "^1.0.0"
+        "internmap": "1 - 2"
       }
     },
+    "d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="
+    },
+    "d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="
+    },
     "d3-format": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
-      "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="
     },
     "d3-interpolate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
-      "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
       "requires": {
-        "d3-color": "1"
-      },
-      "dependencies": {
-        "d3-color": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
-          "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
-        }
+        "d3-color": "1 - 3"
       }
     },
     "d3-path": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
-      "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="
     },
     "d3-scale": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
-      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
       "requires": {
-        "d3-array": "^2.3.0",
-        "d3-format": "1 - 2",
-        "d3-interpolate": "1.2.0 - 2",
-        "d3-time": "^2.1.1",
-        "d3-time-format": "2 - 3"
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
       }
     },
     "d3-shape": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
-      "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
       "requires": {
-        "d3-path": "1"
+        "d3-path": "^3.1.0"
       }
     },
     "d3-time": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
-      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
       "requires": {
-        "d3-array": "2"
+        "d3-array": "2 - 3"
       }
     },
     "d3-time-format": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
-      "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
       "requires": {
-        "d3-time": "1 - 2"
+        "d3-time": "1 - 3"
       }
     },
+    "d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="
+    },
     "damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -6784,16 +6693,6 @@
         "once": "^1.4.0"
       }
     },
-    "enhanced-resolve": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      }
-    },
     "entities": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
@@ -6852,12 +6751,6 @@
       "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
     },
-    "es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
-    },
     "es-shim-unscopables": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
@@ -7636,8 +7529,7 @@
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "events": {
       "version": "3.3.0",
@@ -8054,6 +7946,11 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "fast-equals": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-4.0.3.tgz",
+      "integrity": "sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg=="
+    },
     "fast-glob": {
       "version": "3.2.11",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
@@ -9168,9 +9065,9 @@
       }
     },
     "internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="
     },
     "invariant": {
       "version": "2.2.4",
@@ -14324,9 +14221,9 @@
       "dev": true
     },
     "json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
     },
     "jsonfile": {
       "version": "6.1.0",
@@ -14589,11 +14486,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "math-expression-evaluator": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.4.0.tgz",
-      "integrity": "sha512-4vRUvPyxdO8cWULGTh9dZWL2tZK6LDBvj+OGHBER7poH9Qdt7kXEoj20wiz4lQUbUXQZFjPbe5mVDo9nutizCw=="
-    },
     "mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -15295,7 +15187,8 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "dev": true
     },
     "picocolors": {
       "version": "1.0.0",
@@ -16309,15 +16202,11 @@
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "dev": true,
       "requires": {
         "performance-now": "^2.1.0"
       }
     },
-    "raf-schd": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
-      "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ=="
-    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -16515,9 +16404,9 @@
           "dev": true
         },
         "loader-utils": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
-          "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+          "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
           "dev": true
         },
         "locate-path": {
@@ -16733,15 +16622,11 @@
       "dev": true
     },
     "react-resize-detector": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-4.2.3.tgz",
-      "integrity": "sha512-4AeS6lxdz2KOgDZaOVt1duoDHrbYwSrUX32KeM9j6t9ISyRphoJbTRCMS1aPFxZHFqcCGLT1gMl3lEcSWZNW0A==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-8.1.0.tgz",
+      "integrity": "sha512-S7szxlaIuiy5UqLhLL1KY3aoyGHbZzsTpYal9eYMwCyKqoqoVLCmIgAgNyIM1FhnP2KyBygASJxdhejrzjMb+w==",
       "requires": {
-        "lodash": "^4.17.15",
-        "lodash-es": "^4.17.15",
-        "prop-types": "^15.7.2",
-        "raf-schd": "^4.0.2",
-        "resize-observer-polyfill": "^1.5.1"
+        "lodash": "^4.17.21"
       }
     },
     "react-scripts": {
@@ -17199,14 +17084,12 @@
       }
     },
     "react-smooth": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-1.0.6.tgz",
-      "integrity": "sha512-B2vL4trGpNSMSOzFiAul9kFAsxTukL9Wyy9EXtkQy3GJr6sZqW9e1nShdVOJ3hRYamPZ94O17r3Q0bjSw3UYtg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-2.0.2.tgz",
+      "integrity": "sha512-pgqSp1q8rAGtF1bXQE0m3CHGLNfZZh5oA5o1tsPLXRHnKtkujMIJ8Ws5nO1mTySZf1c4vgwlEk+pHi3Ln6eYLw==",
       "requires": {
-        "lodash": "~4.17.4",
-        "prop-types": "^15.6.0",
-        "raf": "^3.4.0",
-        "react-transition-group": "^2.5.0"
+        "fast-equals": "^4.0.3",
+        "react-transition-group": "2.9.0"
       },
       "dependencies": {
         "react-transition-group": {
@@ -17319,21 +17202,19 @@
       }
     },
     "recharts": {
-      "version": "2.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.0.0-beta.1.tgz",
-      "integrity": "sha512-awJH2DE6JRgp5ymzmH5dKh2Pu6prqZJCr3NRaYCcyub1fBa+fIG3ZlpLyl9hWizHPGEvfZLvcjIM+qgTsr9aSQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.5.0.tgz",
+      "integrity": "sha512-0EQYz3iA18r1Uq8VqGZ4dABW52AKBnio37kJgnztIqprELJXpOEsa0SzkqU1vjAhpCXCv52Dx1hiL9119xsqsQ==",
       "requires": {
         "classnames": "^2.2.5",
-        "core-js": "^3.4.2",
-        "d3-interpolate": "^1.3.0",
-        "d3-scale": "^3.1.0",
-        "d3-shape": "^1.3.5",
-        "lodash": "^4.17.5",
-        "prop-types": "^15.6.0",
-        "react-resize-detector": "^4.2.1",
-        "react-smooth": "^1.0.5",
-        "recharts-scale": "^0.4.2",
-        "reduce-css-calc": "^1.3.0"
+        "eventemitter3": "^4.0.1",
+        "lodash": "^4.17.19",
+        "react-is": "^16.10.2",
+        "react-resize-detector": "^8.0.4",
+        "react-smooth": "^2.0.2",
+        "recharts-scale": "^0.4.4",
+        "reduce-css-calc": "^2.1.8",
+        "victory-vendor": "^36.6.8"
       }
     },
     "recharts-scale": {
@@ -17345,50 +17226,30 @@
       }
     },
     "recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
       "dev": true,
       "requires": {
-        "minimatch": "3.0.4"
-      },
-      "dependencies": {
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        }
+        "minimatch": "^3.0.5"
       }
     },
     "reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha512-0dVfwYVOlf/LBA2ec4OwQ6p3X9mYxn/wOl2xTcLwjnPYrkgEfPx3VI4eGCH3rQLlPISG5v9I9bkZosKsNRTRKA==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
+      "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==",
       "requires": {
-        "balanced-match": "^0.4.2",
-        "math-expression-evaluator": "^1.2.14",
-        "reduce-function-call": "^1.0.1"
+        "css-unit-converter": "^1.1.1",
+        "postcss-value-parser": "^3.3.0"
       },
       "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha512-STw03mQKnGUYtoNjmowo4F2cRmIIxYEGiMsjjwla/u5P1lxadj/05WkNaFjNiKTgJkj8KiXbgAiRTmcQRwQNtg=="
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
         }
       }
     },
-    "reduce-function-call": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
-      "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
-      "requires": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "redux": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz",
@@ -17625,11 +17486,6 @@
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
-    "resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-    },
     "resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -19326,6 +19182,37 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
+    "victory-vendor": {
+      "version": "36.6.8",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.8.tgz",
+      "integrity": "sha512-H3kyQ+2zgjMPvbPqAl7Vwm2FD5dU7/4bCTQakFQnpIsfDljeOMDojRsrmJfwh4oAlNnWhpAf+mbAoLh8u7dwyQ==",
+      "requires": {
+        "@types/d3-array": "^3.0.3",
+        "@types/d3-ease": "^3.0.0",
+        "@types/d3-interpolate": "^3.0.1",
+        "@types/d3-scale": "^4.0.2",
+        "@types/d3-shape": "^3.1.0",
+        "@types/d3-time": "^3.0.0",
+        "@types/d3-timer": "^3.0.0",
+        "d3-array": "^3.1.6",
+        "d3-ease": "^3.0.1",
+        "d3-interpolate": "^3.0.1",
+        "d3-scale": "^4.0.2",
+        "d3-shape": "^3.1.0",
+        "d3-time": "^3.0.0",
+        "d3-timer": "^3.0.1"
+      },
+      "dependencies": {
+        "@types/d3-shape": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.1.tgz",
+          "integrity": "sha512-6Uh86YFF7LGg4PQkuO2oG6EMBRLuW9cbavUW46zkIO5kuS2PfTqo2o9SkgtQzguBHbLgNnU90UNsITpsX1My+A==",
+          "requires": {
+            "@types/d3-path": "*"
+          }
+        }
+      }
+    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -19386,22 +19273,22 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.74.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+      "version": "5.80.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.80.0.tgz",
+      "integrity": "sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@types/estree": "^1.0.0",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.10.0",
-        "es-module-lexer": "^0.9.0",
+        "enhanced-resolve": "^5.13.0",
+        "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
@@ -19410,17 +19297,189 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
+        "schema-utils": "^3.1.2",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
+        "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
-        "@types/estree": {
-          "version": "0.0.51",
-          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-          "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+        "@jridgewell/trace-mapping": {
+          "version": "0.3.18",
+          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+          "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/resolve-uri": "3.1.0",
+            "@jridgewell/sourcemap-codec": "1.4.14"
+          }
+        },
+        "@webassemblyjs/ast": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz",
+          "integrity": "sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/helper-numbers": "1.11.5",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.5"
+          }
+        },
+        "@webassemblyjs/floating-point-hex-parser": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz",
+          "integrity": "sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==",
+          "dev": true
+        },
+        "@webassemblyjs/helper-api-error": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz",
+          "integrity": "sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==",
+          "dev": true
+        },
+        "@webassemblyjs/helper-buffer": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz",
+          "integrity": "sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==",
+          "dev": true
+        },
+        "@webassemblyjs/helper-numbers": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz",
+          "integrity": "sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/floating-point-hex-parser": "1.11.5",
+            "@webassemblyjs/helper-api-error": "1.11.5",
+            "@xtuc/long": "4.2.2"
+          }
+        },
+        "@webassemblyjs/helper-wasm-bytecode": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz",
+          "integrity": "sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==",
+          "dev": true
+        },
+        "@webassemblyjs/helper-wasm-section": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz",
+          "integrity": "sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.5",
+            "@webassemblyjs/helper-buffer": "1.11.5",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+            "@webassemblyjs/wasm-gen": "1.11.5"
+          }
+        },
+        "@webassemblyjs/ieee754": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz",
+          "integrity": "sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==",
+          "dev": true,
+          "requires": {
+            "@xtuc/ieee754": "^1.2.0"
+          }
+        },
+        "@webassemblyjs/leb128": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz",
+          "integrity": "sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==",
+          "dev": true,
+          "requires": {
+            "@xtuc/long": "4.2.2"
+          }
+        },
+        "@webassemblyjs/utf8": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz",
+          "integrity": "sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==",
+          "dev": true
+        },
+        "@webassemblyjs/wasm-edit": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz",
+          "integrity": "sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.5",
+            "@webassemblyjs/helper-buffer": "1.11.5",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+            "@webassemblyjs/helper-wasm-section": "1.11.5",
+            "@webassemblyjs/wasm-gen": "1.11.5",
+            "@webassemblyjs/wasm-opt": "1.11.5",
+            "@webassemblyjs/wasm-parser": "1.11.5",
+            "@webassemblyjs/wast-printer": "1.11.5"
+          }
+        },
+        "@webassemblyjs/wasm-gen": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz",
+          "integrity": "sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.5",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+            "@webassemblyjs/ieee754": "1.11.5",
+            "@webassemblyjs/leb128": "1.11.5",
+            "@webassemblyjs/utf8": "1.11.5"
+          }
+        },
+        "@webassemblyjs/wasm-opt": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz",
+          "integrity": "sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.5",
+            "@webassemblyjs/helper-buffer": "1.11.5",
+            "@webassemblyjs/wasm-gen": "1.11.5",
+            "@webassemblyjs/wasm-parser": "1.11.5"
+          }
+        },
+        "@webassemblyjs/wasm-parser": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz",
+          "integrity": "sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.5",
+            "@webassemblyjs/helper-api-error": "1.11.5",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+            "@webassemblyjs/ieee754": "1.11.5",
+            "@webassemblyjs/leb128": "1.11.5",
+            "@webassemblyjs/utf8": "1.11.5"
+          }
+        },
+        "@webassemblyjs/wast-printer": {
+          "version": "1.11.5",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz",
+          "integrity": "sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.5",
+            "@xtuc/long": "4.2.2"
+          }
+        },
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        },
+        "enhanced-resolve": {
+          "version": "5.13.0",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz",
+          "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.4",
+            "tapable": "^2.2.0"
+          }
+        },
+        "es-module-lexer": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz",
+          "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==",
           "dev": true
         },
         "eslint-scope": {
@@ -19438,6 +19497,77 @@
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
           "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
           "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "jest-worker": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+          "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "schema-utils": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
+          "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "serialize-javascript": {
+          "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==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "terser": {
+          "version": "5.17.1",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
+          "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/source-map": "^0.3.2",
+            "acorn": "^8.5.0",
+            "commander": "^2.20.0",
+            "source-map-support": "~0.5.20"
+          }
+        },
+        "terser-webpack-plugin": {
+          "version": "5.3.7",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz",
+          "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/trace-mapping": "^0.3.17",
+            "jest-worker": "^27.4.5",
+            "schema-utils": "^3.1.1",
+            "serialize-javascript": "^6.0.1",
+            "terser": "^5.16.5"
+          }
         }
       }
     },
diff --git a/src/ui-client/package.json b/src/ui-client/package.json
index 6c8573e0e..a53ad4728 100644
--- a/src/ui-client/package.json
+++ b/src/ui-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui-client",
-  "version": "3.11.2",
+  "version": "3.11.3",
   "private": true,
   "dependencies": {
     "@types/d3-format": "^1.3.1",
@@ -39,7 +39,7 @@
     "react-redux": "^7.1.0",
     "react-textarea-autosize": "^7.1.0",
     "reactstrap": "^8.0.1",
-    "recharts": "2.0.0-beta.1",
+    "recharts": "^2.5.0",
     "redux": "^4.0.4",
     "redux-devtools-extension": "^2.13.8",
     "redux-thunk": "^2.3.0",
diff --git a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx
index 910e77338..cc05d0de8 100644
--- a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx
+++ b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx
@@ -51,12 +51,14 @@ export default class CustomAttestationConfirmation extends React.PureComponent<P
                                 className="leaf-button leaf-button-primary">
                                 I Agree
                             </Button>
+                            {config && !config.attestation.skipModeSelection &&
                             <Button 
                                 onClick={handleGoBackClick} 
                                 tabIndex={-1}
                                 className="leaf-button">
                                 Go Back
                             </Button>
+                            }
                         </Col>
                         }
                         {(isSubmittingAttestation || hasAttested) &&
diff --git a/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx
index 877f9eac4..fd1916c0b 100644
--- a/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx
+++ b/src/ui-client/src/components/Attestation/StandardAttestationConfirmation.tsx
@@ -45,12 +45,14 @@ export default class StandardAttestationConfirmation extends React.PureComponent
                 ]}
                 {!(isSubmittingAttestation || hasAttested) &&
                 <div className={`${c}-confirmation-footer`}>
+                    {config && !config.attestation.skipModeSelection &&
                     <Button 
                         onClick={handleGoBackClick} 
                         tabIndex={-1}
                         className="leaf-button mr-auto">
                         Go Back
                     </Button>
+                    }
                     <Button 
                         onClick={handleIAgreeClick} 
                         tabIndex={-1}
diff --git a/src/ui-client/src/containers/Attestation/Attestation.css b/src/ui-client/src/containers/Attestation/Attestation.css
index b7164df55..ba21009ab 100644
--- a/src/ui-client/src/containers/Attestation/Attestation.css
+++ b/src/ui-client/src/containers/Attestation/Attestation.css
@@ -22,6 +22,10 @@
     overflow-x: hidden;
 }
 
+.attestation-header {
+    padding: 4px 8px !important;
+}
+
 .attestation-header h5 {
     width: 100%;
 }
@@ -361,4 +365,37 @@
 .attestation-custom-html > p,
 .attestation-custom-html > li {
     font-size: 1rem !important;
+}
+
+.attestation-custom-credits {
+    display: flex !important;
+    width: 100%;
+}
+
+.attestation-custom-credits > div {
+    flex-basis: 0;
+    flex-grow: 1;
+}
+
+.attestation-custom-credits-logo-wrapper,
+.attestation-custom-credits-text {
+    text-align: center;
+}
+
+.attestation-custom-credits-text {
+    font-family: Roboto;
+    font-size: 1.1rem;
+    font-weight: 300;
+}
+
+.attestation-custom-credits-text span {
+    border: 1px solid rgb(235,235,235);
+    border-radius: 8px;
+    display: inline-block;
+    max-width: 200px;
+    padding: 4px;
+}
+
+.attestation-custom-credits-logo-wrapper img {
+    height: 50px;
 }
\ No newline at end of file
diff --git a/src/ui-client/src/containers/Attestation/Attestation.tsx b/src/ui-client/src/containers/Attestation/Attestation.tsx
index be4205644..8051bcc01 100644
--- a/src/ui-client/src/containers/Attestation/Attestation.tsx
+++ b/src/ui-client/src/containers/Attestation/Attestation.tsx
@@ -84,14 +84,24 @@ class Attestation extends React.PureComponent<Props, State> {
     public getSnapshotBeforeUpdate(prevProps: Props): any {
         const { config, isSubmittingAttestation, userContext, hasAttested } = this.props;
         if (hasAttested || isSubmittingAttestation || this.attestSkipStarted) { return null; }
-        if (userContext && config && !config.attestation.enabled) {
-            this.attestSkipStarted = true;
-            this.setState({ 
-                sessionTypeSelected: true, 
-                documentationStatusSelected: true, 
-                identificationTypeSelected: true,
-                attestation: { ...this.state.attestation, isIdentified: !config.cohort.deidentificationEnabled }
-            }, () => this.skipAttestationAndLoadSession());
+        if (userContext && config) {
+            if (!config.attestation.enabled) {
+                this.attestSkipStarted = true;
+                this.setState({ 
+                    sessionTypeSelected: true, 
+                    documentationStatusSelected: true, 
+                    identificationTypeSelected: true,
+                    attestation: { ...this.state.attestation, isIdentified: !config.cohort.deidentificationEnabled }
+                }, () => this.skipAttestationAndLoadSession());
+            } else if (config.attestation.skipModeSelection) {
+                this.attestSkipStarted = true;
+                this.setState({ 
+                    sessionTypeSelected: true, 
+                    documentationStatusSelected: true, 
+                    identificationTypeSelected: true,
+                    attestation: { ...this.state.attestation, isIdentified: !config.cohort.deidentificationEnabled }
+                });
+            }
         }
         return null;
     }
@@ -136,6 +146,8 @@ class Attestation extends React.PureComponent<Props, State> {
                 size="lg"
                 wrapClassName={`${c}-modal-wrap`}>
                 <ModalHeader className={`${c}-header`}>
+
+                    {/* Top logo row (Leaf, ITHS, CD2H) */}
                     <div className={`${c}-leaf-logo-wrapper`}>
                         <img alt='leaf-logo' className={`${c}-leaf-logo`} src={process.env.PUBLIC_URL + '/images/logos/apps/leaf.svg'} />
                         <div className={`${c}-title`}>
@@ -149,7 +161,29 @@ class Attestation extends React.PureComponent<Props, State> {
                     <div className={`${c}-cd2h-logo-wrapper`}>
                         <img alt='cd2h-logo' className={`${c}-cd2h-logo`} src={process.env.PUBLIC_URL + '/images/logos/orgs/cd2h.png'} />
                     </div>
+
+                    {/* Optional instance logo row */}
+                    {config && config.attestation.credits.enabled &&
+                    <div className={`${c}-custom-credits`}>
+                        {config.attestation.credits.logos &&
+                        config.attestation.credits.logos.map(l => {
+                            return (
+                                <div key={l} className={`${c}-custom-credits-logo-wrapper`}>
+                                    <img alt={`'${l}' not found`} className={`${c}-custom-logo`} src={process.env.PUBLIC_URL + l} />
+                                </div>
+                            );
+                        })
+                        }
+                        <div className={`${c}-custom-credits-text`}>
+                            <span>
+                                {config.attestation.credits.text}
+                            </span>
+                        </div>
+                    </div>
+                    }
+
                 </ModalHeader>
+
                 <div className={progressBarClasses.join(' ')} style={{ width: `${sessionLoadProgressPercent}%` }} />
                 {userContext && !userContext.isPhiOkay && 
                 <div className={`${c}-deidentonly`}>
diff --git a/src/ui-client/src/models/Auth.ts b/src/ui-client/src/models/Auth.ts
index eb0f033e2..82b9b372d 100644
--- a/src/ui-client/src/models/Auth.ts
+++ b/src/ui-client/src/models/Auth.ts
@@ -32,8 +32,16 @@ interface LogoutConfigDTO {
 
 interface AttestationOptionsDTO {
     enabled: boolean;
+    skipModeSelection: boolean;
     text?: string[];
-    type?: CustomAttestationType
+    type?: CustomAttestationType;
+    credits: AttestationCreditsOptionsDTO;
+}
+
+interface AttestationCreditsOptionsDTO {
+    enabled: boolean;
+    logos: string[];
+    text: string;
 }
 
 interface VersionConfigDTO {